From ee0285596f9c062b4aa7c30308fa0b069df14893 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Thu, 23 Apr 2009 19:33:03 -0400
Subject: [PATCH] --- yaml --- r: 153663 b: refs/heads/master c:
 017cb47f46722f29d101a709a2094d151111ed6d h: refs/heads/master i:   153661:
 85aff0c1e76a31954637566099fa7ac7eff0da78   153659:
 b11163f9672043610bdbd61f8b75cbc4ca265803   153655:
 52ce6c1798385941bf2e944bec027439c7239c20   153647:
 1c83ae938f06ce350b1fa04284af734196f69181   153631:
 d6b00f55bb85accf77e377392f99d481342f2c66   153599:
 031ff737217cc98f495183e2ac2b039a8cc148bd v: v3

---
 [refs]                     |  2 +-
 trunk/net/sunrpc/svcsock.c | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 78774abfd145..993fda618471 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58de2f86585dd8fc785aca6625adee32af84b8d7
+refs/heads/master: 017cb47f46722f29d101a709a2094d151111ed6d
diff --git a/trunk/net/sunrpc/svcsock.c b/trunk/net/sunrpc/svcsock.c
index 983bfa9f3102..4e6d406264a0 100644
--- a/trunk/net/sunrpc/svcsock.c
+++ b/trunk/net/sunrpc/svcsock.c
@@ -242,26 +242,27 @@ static int svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr)
  */
 static int svc_one_sock_name(struct svc_sock *svsk, char *buf, int remaining)
 {
+	const struct sock *sk = svsk->sk_sk;
+	const char *proto_name = sk->sk_protocol == IPPROTO_UDP ?
+							"udp" : "tcp";
 	int len;
 
-	switch(svsk->sk_sk->sk_family) {
+	switch (sk->sk_family) {
 	case PF_INET:
 		len = snprintf(buf, remaining, "ipv4 %s %pI4 %d\n",
-			      svsk->sk_sk->sk_protocol == IPPROTO_UDP ?
-			      "udp" : "tcp",
-			      &inet_sk(svsk->sk_sk)->rcv_saddr,
-			      inet_sk(svsk->sk_sk)->num);
+				proto_name,
+				&inet_sk(sk)->rcv_saddr,
+				inet_sk(sk)->num);
 		break;
 	case PF_INET6:
 		len = snprintf(buf, remaining, "ipv6 %s %pI6 %d\n",
-				svsk->sk_sk->sk_protocol == IPPROTO_UDP ?
-				"udp" : "tcp",
-				&inet6_sk(svsk->sk_sk)->rcv_saddr,
-				inet_sk(svsk->sk_sk)->num);
+				proto_name,
+				&inet6_sk(sk)->rcv_saddr,
+				inet_sk(sk)->num);
 		break;
 	default:
 		len = snprintf(buf, remaining, "*unknown-%d*\n",
-			       svsk->sk_sk->sk_family);
+				sk->sk_family);
 	}
 
 	if (len >= remaining) {