From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Fri, 17 Oct 2014 20:02:52 +0000 (+0300)
Subject: NFS: Don't try to reclaim delegation open state if recovery failed
X-Git-Tag: firefly_0821_release~3679^2~1168
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=bc2075d558b1395a80c1354665679c8970ba5829;p=firefly-linux-kernel-4.4.55.git

NFS: Don't try to reclaim delegation open state if recovery failed

commit f8ebf7a8ca35dde321f0cd385fee6f1950609367 upstream.

If state recovery failed, then we should not attempt to reclaim delegated
state.

http://lkml.kernel.org/r/CAN-5tyHwG=Cn2Q9KsHWadewjpTTy_K26ee+UnSvHvG4192p-Xw@mail.gmail.com
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index 4b49a8c6ccad..3fa904c9e7ef 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -108,6 +108,8 @@ again:
 			continue;
 		if (!test_bit(NFS_DELEGATED_STATE, &state->flags))
 			continue;
+		if (!nfs4_valid_open_stateid(state))
+			continue;
 		if (!nfs4_stateid_match(&state->stateid, stateid))
 			continue;
 		get_nfs_open_context(ctx);