diff options
author | Weston Andros Adamson <dros@netapp.com> | 2012-10-02 11:33:22 -0700 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-02 11:35:47 -0700 |
commit | fd4835708ffd3387a76df2d1d3021717b0b63761 (patch) | |
tree | c47e28f44d10d10b96e7ab9aa8024aa613c3dbd5 /fs/nfs/nfs4state.c | |
parent | c2ccc084eb46ae718a200ad9c2606c258bf79a25 (diff) | |
download | linux-3.10-fd4835708ffd3387a76df2d1d3021717b0b63761.tar.gz linux-3.10-fd4835708ffd3387a76df2d1d3021717b0b63761.tar.bz2 linux-3.10-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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 24a3ab492df..c351e6b3983 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); } |