diff options
| author | Stanislav Kinsbursky | 2012-08-20 16:00:36 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2012-10-02 00:25:47 +0200 |
| commit | bbe0a3aa4e227c8aae02a484ce1c0b655cd19055 (patch) | |
| tree | 22b02b554f7b3abea3fabb92f3856aec7e84b762 /fs/nfs/nfs4state.c | |
| parent | NFS: callback up - users counting cleanup (diff) | |
| download | kernel-qcow2-linux-bbe0a3aa4e227c8aae02a484ce1c0b655cd19055.tar.gz kernel-qcow2-linux-bbe0a3aa4e227c8aae02a484ce1c0b655cd19055.tar.xz kernel-qcow2-linux-bbe0a3aa4e227c8aae02a484ce1c0b655cd19055.zip | |
NFS: make nfs_callback_tcpport per network context
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4state.c')
| -rw-r--r-- | fs/nfs/nfs4state.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index a5331ec094a6..716cdc20475f 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -56,6 +56,7 @@ #include "delegation.h" #include "internal.h" #include "pnfs.h" +#include "netns.h" #define NFSDBG_FACILITY NFSDBG_STATE @@ -73,10 +74,11 @@ int nfs4_init_clientid(struct nfs_client *clp, struct rpc_cred *cred) }; unsigned short port; int status; + struct nfs_net *nn = net_generic(clp->cl_net, nfs_net_id); if (test_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state)) goto do_confirm; - port = nfs_callback_tcpport; + port = nn->nfs_callback_tcpport; if (clp->cl_addr.ss_family == AF_INET6) port = nfs_callback_tcpport6; |