summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-01-23 13:22:45 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-01-31 19:28:22 -0500
commitd3b773e4fd80524ac27802fcf11cfd9ed1d5491f (patch)
treeeb0577d113cdd4b84b0f8e82616ccc6a8988a77b /net
parentd36b7cf7c626749efc75f49fb0468e8c3c0c1bbd (diff)
downloadlinux-3.10-d3b773e4fd80524ac27802fcf11cfd9ed1d5491f.tar.gz
linux-3.10-d3b773e4fd80524ac27802fcf11cfd9ed1d5491f.tar.bz2
linux-3.10-d3b773e4fd80524ac27802fcf11cfd9ed1d5491f.zip
SUNRPC: fixup for namespace changes
Fixes this build error when CONFIG_NET_NS is not set: net/sunrpc/svcsock.c: In function 'svc_setup_socket': net/sunrpc/svcsock.c:1412:40: error: 'struct sock_common' has no member named 'skc_net' Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/svcsock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index e8af0c9e436..e088b1633d3 100644
--- a/net/sunrpc/svcsock.c
+++ b/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));