From c5a61fafac3e7fa135da165ba047290c9e8c2d6e Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 23 Jan 2012 13:22:45 -0500
Subject: [PATCH] --- yaml --- r: 294438 b: refs/heads/master c:
 d3b773e4fd80524ac27802fcf11cfd9ed1d5491f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4f0f8d5c08ce..080f189a1696 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d36b7cf7c626749efc75f49fb0468e8c3c0c1bbd
+refs/heads/master: d3b773e4fd80524ac27802fcf11cfd9ed1d5491f
diff --git a/trunk/net/sunrpc/svcsock.c b/trunk/net/sunrpc/svcsock.c
index e8af0c9e436b..e088b1633d36 100644
--- a/trunk/net/sunrpc/svcsock.c
+++ b/trunk/net/sunrpc/svcsock.c
@@ -1409,7 +1409,7 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv,
 
 	/* Register socket with portmapper */
 	if (*errp >= 0 && pmap_register)
-		*errp = svc_register(serv, sock->sk->sk_net, inet->sk_family,
+		*errp = svc_register(serv, sock_net(sock->sk), inet->sk_family,
 				     inet->sk_protocol,
 				     ntohs(inet_sk(inet)->inet_sport));