git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2afdfa5
)
NFSv4: Fix up a merge conflict between migration and container changes
author
Trond Myklebust
<Trond.Myklebust@netapp.com>
Mon, 1 Oct 2012 23:17:31 +0000
(16:17 -0700)
committer
Trond Myklebust
<Trond.Myklebust@netapp.com>
Mon, 1 Oct 2012 23:17:31 +0000
(16:17 -0700)
nfs_callback_tcpport is now per-net_namespace.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/nfs4state.c
patch
|
blob
|
history
diff --git
a/fs/nfs/nfs4state.c
b/fs/nfs/nfs4state.c
index
5c42866
..
3da8130
100644
(file)
--- 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 = n
n->n
fs_callback_tcpport;
if (clp->cl_addr.ss_family == AF_INET6)
- port = nfs_callback_tcpport6;
+ port = n
n->n
fs_callback_tcpport6;
status = nfs4_proc_setclientid(clp, NFS4_CALLBACK, port, cred, &clid);
if (status != 0)