From f96c1ce13b616849b11f837ff4b5ec824a663a86 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 1 Oct 2012 16:17:31 -0700 Subject: [PATCH] --- yaml --- r: 333194 b: refs/heads/master c: 9f62387d6e26532bcbfb15606956074192ee526a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4state.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ddde376b740f..1b47d5128d91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2afdfa5a846246de50e1881f71ba5c0aac0b415f +refs/heads/master: 9f62387d6e26532bcbfb15606956074192ee526a diff --git a/trunk/fs/nfs/nfs4state.c b/trunk/fs/nfs/nfs4state.c index 5c4286643701..3da8130d4460 100644 --- a/trunk/fs/nfs/nfs4state.c +++ b/trunk/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)