[v8,11/11] NFSv4: Check the open stateid when searching for expired state

Commit Message

Trond Myklebust Nov. 6, 2017, 8:28 p.m. UTC

Signed-off-by: Trond Myklebust <[e-mail]>
---
 fs/nfs/nfs4state.c | 5 +++++
 1 file changed, 5 insertions(+)

Patch

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 4a6f77880992..4415eda2ed35 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1431,6 +1431,11 @@  void nfs_inode_find_state_and_recover(struct inode *inode,
 			found = true;
 			continue;
 		}
+		if (nfs4_stateid_match_other(&state->open_stateid, stateid) &&
+		    nfs4_state_mark_reclaim_nograce(clp, state)) {
+			found = true;
+			continue;
+		}
 		if (nfs_state_lock_state_matches_stateid(state, stateid) &&
 		    nfs4_state_mark_reclaim_nograce(clp, state))
 			found = true;