| Message ID | 1349135341-30170-1-git-send-email-mora@cyclsvl26.eng.netapp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 2012-10-01 at 16:49 -0700, Jorge Mora wrote: > From: Jorge Mora <mora@netapp.com> > > > Signed-off-by: Jorge Mora <mora@netapp.com> > --- > Fixes bug on Trond's testing branch > fs/nfs/nfs4state.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) Yes. We should now have a fix for this + 2 other issues in the current testing branch... -- Trond Myklebust Linux NFS client maintainer NetApp Trond.Myklebust@netapp.com www.netapp.com
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 5c42866..2602290 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -123,10 +123,11 @@ int nfs40_discover_server_trunking(struct nfs_client *clp, }; unsigned short port; int status; + struct nfs_net *nn = net_generic(clp->cl_net, nfs_net_id); - 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)