diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2012-03-21 16:42:14 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-03-26 11:48:54 -0400 |
| commit | 1df00640c9111c881633d9b219f18e66c52599ec (patch) | |
| tree | e36d3924d84f47ec93f6650ff1fd5b8ea7d10d24 /fs/nfsd/nfs4state.c | |
| parent | ab4684d1560f8d77f6ce82bd3f1f82937070d397 (diff) | |
| parent | 5a7c9eec9fde1da0e3adf0a4ddb64ff2a324a492 (diff) | |
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 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index e318964d8aca..a0a2b535b0e0 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
| @@ -1346,7 +1346,7 @@ gen_callback(struct nfs4_client *clp, struct nfsd4_setclientid *se, struct svc_r | |||
| 1346 | else | 1346 | else |
| 1347 | goto out_err; | 1347 | goto out_err; |
| 1348 | 1348 | ||
| 1349 | conn->cb_addrlen = rpc_uaddr2sockaddr(se->se_callback_addr_val, | 1349 | conn->cb_addrlen = rpc_uaddr2sockaddr(&init_net, se->se_callback_addr_val, |
| 1350 | se->se_callback_addr_len, | 1350 | se->se_callback_addr_len, |
| 1351 | (struct sockaddr *)&conn->cb_addr, | 1351 | (struct sockaddr *)&conn->cb_addr, |
| 1352 | sizeof(conn->cb_addr)); | 1352 | sizeof(conn->cb_addr)); |