summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4state.c
diff options
context:
space:
mode:
authorWeston Andros Adamson <dros@netapp.com>2012-10-02 20:33:22 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-02 20:35:47 +0200
commitfd4835708ffd3387a76df2d1d3021717b0b63761 (patch)
treec47e28f44d10d10b96e7ab9aa8024aa613c3dbd5 /fs/nfs/nfs4state.c
parentNFS: nfs41_walk_client_list(): re-lock before iterating (diff)
downloadlinux-fd4835708ffd3387a76df2d1d3021717b0b63761.tar.xz
linux-fd4835708ffd3387a76df2d1d3021717b0b63761.zip
NFSv4.1: don't do two EXCHANGE_IDs on mount
Since the addition of NFSv4 server trunking detection the mount context calls nfs4_proc_exchange_id then schedules the state manager, which also calls nfs4_proc_exchange_id. Setting the NFS4CLNT_LEASE_CONFIRM bit makes the state manager skip the unneeded EXCHANGE_ID and continue on with session creation. Reported-by: Jorge Mora <mora@netapp.com> Signed-off-by: Weston Andros Adamson <dros@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4state.c')
-rw-r--r--fs/nfs/nfs4state.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 24a3ab492df2..c351e6b39838 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -351,6 +351,7 @@ int nfs41_discover_server_trunking(struct nfs_client *clp,
status = nfs4_proc_exchange_id(clp, cred);
if (status != NFS4_OK)
return status;
+ set_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state);
return nfs41_walk_client_list(clp, result, cred);
}