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>

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index a86f3acf3212f84f639be199b4b30baff28846f3..bc4ca6f4d8c6692c41488f1bf420fe6fb1bf27e5 100644 (file)
--- 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 */