summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2014-10-17 23:02:52 +0300
committerTrond Myklebust <trond.myklebust@primarydata.com>2014-11-12 17:19:04 -0500
commitf8ebf7a8ca35dde321f0cd385fee6f1950609367 (patch)
treee46ece4ad85c0a818247aa29a0a4849a8e168583 /fs/nfs
parentc606bb8857921d3ecf4d353942d6cc7e116cc75a (diff)
downloadop-kernel-dev-f8ebf7a8ca35dde321f0cd385fee6f1950609367.zip
op-kernel-dev-f8ebf7a8ca35dde321f0cd385fee6f1950609367.tar.gz
NFS: Don't try to reclaim delegation open state if recovery failed
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 Cc: stable@vger.kernel.org Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs')
-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 e5f473d..7f3f606 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -125,6 +125,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);
OpenPOWER on IntegriCloud