commit 29dcc16a8e29371e11fb58fc1292e01f30ff13c5
author Stanislav Kinsbursky <skinsbursky@parallels.com> Mon Aug 20 18:00:41 2012 +0400
committer Trond Myklebust <Trond.Myklebust@netapp.com> Mon Oct 01 15:25:51 2012 -0700
tree c5e901f6c5c76dbf916ecb5196c6cdb527f38ef8
parent bbe0a3aa4e227c8aae02a484ce1c0b655cd19055

NFS: make nfs_callback_tcpport6 per network context

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

fs/nfs/nfs4state.c

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 716cdc2..bd8ed01 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -80,7 +80,7 @@
 		goto do_confirm;
 	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)