iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
NeilBrown 2013-08-12 16:52:47 +10:00 committed by Trond Myklebust
parent 08cb47faa4
commit 6686390bab
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/nfs/nfs4state.c
View File

@ -1415,14 +1415,16 @@ restart:
if (status >= 0) { if (status >= 0) {
status = nfs4_reclaim_locks(state, ops); status = nfs4_reclaim_locks(state, ops);
if (status >= 0) { if (status >= 0) {
spin_lock(&state->state_lock); if (test_bit(NFS_DELEGATED_STATE, &state->flags) != 0) {
list_for_each_entry(lock, &state->lock_states, ls_locks) { spin_lock(&state->state_lock);
if (!test_bit(NFS_LOCK_INITIALIZED, &lock->ls_flags)) list_for_each_entry(lock, &state->lock_states, ls_locks) {
pr_warn_ratelimited("NFS: " if (!test_bit(NFS_LOCK_INITIALIZED, &lock->ls_flags))
"%s: Lock reclaim " pr_warn_ratelimited("NFS: "
"failed!\n", __func__); "%s: Lock reclaim "
"failed!\n", __func__);
}
spin_unlock(&state->state_lock);
} }
spin_unlock(&state->state_lock);
nfs4_put_open_state(state); nfs4_put_open_state(state);
spin_lock(&sp->so_lock); spin_lock(&sp->so_lock);
goto restart; goto restart;