NFSv4: nfs_set_open_stateid must not trigger state recovery for closed state

trondmypd · amschuma-ntap · commit e1fff5df6e04 · 2017-11-17T16:43:49.000-05:00
In nfs_set_open_stateid_locked, we must ignore stateids from closed state.

Reported-by: Andrew W Elble &lt;aweits@rit.edu&gt;
Signed-off-by: Trond Myklebust &lt;trond.myklebust@primarydata.com&gt;
Signed-off-by: Anna Schumaker &lt;Anna.Schumaker@Netapp.com&gt;
diff --git 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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1541,7 +1541,8 @@ static void nfs_set_open_stateid_locked(struct nfs4_state *state,`
`1541`	`1541`	`write_seqlock(&state->seqlock);`
`1542`	`1542`	`}`
`1543`	`1543`
`1544`		`- if (!nfs4_stateid_match_other(stateid, &state->open_stateid)) {`
	`1544`	`+ if (test_bit(NFS_OPEN_STATE, &state->flags) &&`
	`1545`	`+ !nfs4_stateid_match_other(stateid, &state->open_stateid)) {`
`1545`	`1546`	`nfs4_stateid_copy(freeme, &state->open_stateid);`
`1546`	`1547`	`nfs_test_and_clear_all_open_stateid(state);`
`1547`	`1548`	`}`