Merge nfs containerization work from Trond's tree

[firefly-linux-kernel-4.4.55.git] / net / sunrpc / svcsock.c

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index b3bb18ba350a925950929307a0f22134f0c97fd9..824d32fb31214b5f433f439c439e7161fba28fb5 100644 (file)
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -396,7 +396,7 @@ static int svc_partial_recvfrom(struct svc_rqst *rqstp,
                                int buflen, unsigned int base)
 {
        size_t save_iovlen;
-       void __user *save_iovbase;
+       void *save_iovbase;
        unsigned int i;
        int ret;
 
@@ -1407,7 +1407,8 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv,
 
        /* Register socket with portmapper */
        if (*errp >= 0 && pmap_register)
-               *errp = svc_register(serv, inet->sk_family, inet->sk_protocol,
+               *errp = svc_register(serv, sock_net(sock->sk), inet->sk_family,
+                                    inet->sk_protocol,
                                     ntohs(inet_sk(inet)->inet_sport));
 
        if (*errp < 0) {