summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2014-10-17 23:02:52 +0300
committerJiri Slaby <jslaby@suse.cz>2014-11-19 18:38:23 +0100
commita78d2dde1a6297c60901b287ccdb843d260f4483 (patch)
treef9c4a63a2238624e5ff9fa16e3d722cd1ce2f268
parentae87d577bf33ddcfd06cfdfa6df95a13a01f9e55 (diff)
downloadlwn-a78d2dde1a6297c60901b287ccdb843d260f4483.tar.gz
lwn-a78d2dde1a6297c60901b287ccdb843d260f4483.zip
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: Jiri Slaby <jslaby@suse.cz>
-rw-r--r--fs/nfs/delegation.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index 5d8ccecf5f5c..6acc11e6ebad 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -109,6 +109,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);