diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-02 03:17:31 +0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-02 03:17:31 +0400 |
| commit | 9f62387d6e26532bcbfb15606956074192ee526a (patch) | |
| tree | 9102b0babaa7918bcc87f11a8986deee092be908 | |
| parent | 2afdfa5a846246de50e1881f71ba5c0aac0b415f (diff) | |
| download | linux-9f62387d6e26532bcbfb15606956074192ee526a.tar.xz | |
NFSv4: Fix up a merge conflict between migration and container changes
nfs_callback_tcpport is now per-net_namespace.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
| -rw-r--r-- | fs/nfs/nfs4state.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 5c4286643701..3da8130d4460 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -121,12 +121,13 @@ int nfs40_discover_server_trunking(struct nfs_client *clp, .clientid = clp->cl_clientid, .confirm = clp->cl_confirm, }; + struct nfs_net *nn = net_generic(clp->cl_net, nfs_net_id); unsigned short port; int status; - port = nfs_callback_tcpport; + port = nn->nfs_callback_tcpport; if (clp->cl_addr.ss_family == AF_INET6) - port = nfs_callback_tcpport6; + port = nn->nfs_callback_tcpport6; status = nfs4_proc_setclientid(clp, NFS4_CALLBACK, port, cred, &clid); if (status != 0) |