Commit 6686390b authored Aug 12, 2013 by NeilBrown Committed by Trond Myklebust Aug 22, 2013

NFS: remove incorrect "Lock reclaim failed!" warning.



After reclaiming state that was lost, the NFS client tries to reclaim
any locks, and then checks that each one has NFS_LOCK_INITIALIZED set
(which means that the server has confirmed the lock).
However if the client holds a delegation, nfs_reclaim_locks() simply aborts
(or more accurately it called nfs_lock_reclaim() and that returns without
doing anything).

This is because when a delegation is held, the server doesn't need to
know about locks.

So if a delegation is held, NFS_LOCK_INITIALIZED is not expected, and
its absence is certainly not an error.

So don't print the warnings if NFS_DELGATED_STATE is set.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

parent 08cb47fa

fs/nfs/nfs4state.c

+9 −7

Original line number	Diff line number	Diff line
		@@ -1415,6 +1415,7 @@ restart:
		if (status >= 0) {
		status = nfs4_reclaim_locks(state, ops);
		if (status >= 0) {
		if (test_bit(NFS_DELEGATED_STATE, &state->flags) != 0) {
		spin_lock(&state->state_lock);
		list_for_each_entry(lock, &state->lock_states, ls_locks) {
		if (!test_bit(NFS_LOCK_INITIALIZED, &lock->ls_flags))
		@@ -1423,6 +1424,7 @@ restart:
		"failed!\n", __func__);
		}
		spin_unlock(&state->state_lock);
		}
		nfs4_put_open_state(state);
		spin_lock(&sp->so_lock);
		goto restart;

Admin message