NFSv4: nfs_set_open_stateid must not trigger state recovery for closed state

In nfs_set_open_stateid_locked, we must ignore stateids from closed state.

Reported-by: Andrew W Elble <[email protected]>
Signed-off-by: Trond Myklebust <[email protected]>
Signed-off-by: Anna Schumaker <[email protected]>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 1090016a238fd962d0ce86fb66b98ae447f27013..2c9c225796106ac4eeb8e32f25bf1974fed60e96 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1541,7 +1541,8 @@ static void nfs_set_open_stateid_locked(struct nfs4_state *state,
                write_seqlock(&state->seqlock);
        }
 
-       if (!nfs4_stateid_match_other(stateid, &state->open_stateid)) {
+       if (test_bit(NFS_OPEN_STATE, &state->flags) &&
+           !nfs4_stateid_match_other(stateid, &state->open_stateid)) {
                nfs4_stateid_copy(freeme, &state->open_stateid);
                nfs_test_and_clear_all_open_stateid(state);
        }