diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-10-17 23:02:52 +0300 |
---|---|---|
committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-27 11:21:46 +0000 |
commit | ce37df67751f80d66ce8eeccb07971057fe8126b (patch) | |
tree | 28057ce0285f0e3c15d5c79117fc8f4be26933cb /fs | |
parent | 6bcacd764cdcb0086bf2bd6bee6b1e7f913b4735 (diff) | |
download | linux-stable-ce37df67751f80d66ce8eeccb07971057fe8126b.tar.gz linux-stable-ce37df67751f80d66ce8eeccb07971057fe8126b.tar.bz2 linux-stable-ce37df67751f80d66ce8eeccb07971057fe8126b.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: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/delegation.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 289753433f50..3ed1be9aade3 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); |