summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2009-12-05 15:03:20 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2009-12-05 15:03:20 -0500
commit0556d1a6958ba15659ac2089ebc0a3c5e71f08a8 (patch)
treeb4b294653d1ed988084513972c3f22d62fb93cc5 /fs/nfs
parent2597641deae82c9a95e255518da189ab557da0af (diff)
NFSv41: nfs4_reset_session must always set NFS4CLNT_SESSION_DRAINING
Otherwise we have no guarantees that other processes won't start another RPC call while we're resetting the session. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index a86f3acf3212..bc4ca6f4d8c6 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1211,8 +1211,8 @@ static int nfs4_reset_session(struct nfs_client *clp)
INIT_COMPLETION(ses->complete);
spin_lock(&tbl->slot_tbl_lock);
+ set_bit(NFS4CLNT_SESSION_DRAINING, &clp->cl_state);
if (tbl->highest_used_slotid != -1) {
- set_bit(NFS4CLNT_SESSION_DRAINING, &clp->cl_state);
spin_unlock(&tbl->slot_tbl_lock);
status = wait_for_completion_interruptible(&ses->complete);
if (status) /* -ERESTARTSYS */