diff options
| author | J. Bruce Fields | 2012-03-21 21:42:14 +0100 |
|---|---|---|
| committer | J. Bruce Fields | 2012-03-26 17:48:54 +0200 |
| commit | 1df00640c9111c881633d9b219f18e66c52599ec (patch) | |
| tree | e36d3924d84f47ec93f6650ff1fd5b8ea7d10d24 /net/sunrpc/svcsock.c | |
| parent | NFSD: Fix nfs4_verifier memory alignment (diff) | |
| parent | NFS: fix sb->s_id in nfs debug prints (diff) | |
| download | kernel-qcow2-linux-1df00640c9111c881633d9b219f18e66c52599ec.tar.gz kernel-qcow2-linux-1df00640c9111c881633d9b219f18e66c52599ec.tar.xz kernel-qcow2-linux-1df00640c9111c881633d9b219f18e66c52599ec.zip | |
Merge nfs containerization work from Trond's tree
The nfs containerization work is a prerequisite for Jeff Layton's reboot
recovery rework.
Diffstat (limited to 'net/sunrpc/svcsock.c')
| -rw-r--r-- | net/sunrpc/svcsock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index b3bb18ba350a..824d32fb3121 100644 --- 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) { |