summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2013-10-31 13:03:04 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-10-31 13:24:07 -0400
commit1acd1c301f4faae80f4d2c7bbd9a4553b131c0e3 (patch)
treeb6ee894b986baa064c2d5d7af23af694b181299f /fs/nfs
parenta1311d87fa034e0de580e3a65f2d5c2e7a1f55f3 (diff)
downloadop-kernel-dev-1acd1c301f4faae80f4d2c7bbd9a4553b131c0e3.zip
op-kernel-dev-1acd1c301f4faae80f4d2c7bbd9a4553b131c0e3.tar.gz
nfs: fix inverted test for delegation in nfs4_reclaim_open_state
commit 6686390bab6a0e0 (NFS: remove incorrect "Lock reclaim failed!" warning.) added a test for a delegation before checking to see if any reclaimed locks failed. The test however is backward and is only doing that check when a delegation is held instead of when one isn't. Cc: NeilBrown <neilb@suse.de> Signed-off-by: Jeff Layton <jlayton@redhat.com> Fixes: 6686390bab6a: NFS: remove incorrect "Lock reclaim failed!" warning. Cc: stable@vger.kernel.org # 3.12 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 452f4c8..c8e729d 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1476,7 +1476,7 @@ restart:
if (status >= 0) {
status = nfs4_reclaim_locks(state, ops);
if (status >= 0) {
- if (test_bit(NFS_DELEGATED_STATE, &state->flags) != 0) {
+ if (!test_bit(NFS_DELEGATED_STATE, &state->flags)) {
spin_lock(&state->state_lock);
list_for_each_entry(lock, &state->lock_states, ls_locks) {
if (!test_bit(NFS_LOCK_INITIALIZED, &lock->ls_flags))
OpenPOWER on IntegriCloud