Commit 666b3d80 authored Feb 19, 2013 by Trond Myklebust

NLM: Ensure that we resend all pending blocking locks after a reclaim



Currently, nlmclnt_lock will break out of the for(;;) loop when
the reclaimer wakes up the blocking lock thread by setting
nlm_lck_denied_grace_period. This causes the lock request to fail
with an ENOLCK error.
The intention was always to ensure that we resend the lock request
after the grace period has expired.

Reported-by: Wangyuan Zhang <Wangyuan.Zhang@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@vger.kernel.org

parent 5a12cca6

fs/lockd/clntproc.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -550,6 +550,9 @@ again:
		status = nlmclnt_block(block, req, NLMCLNT_POLL_TIMEOUT);
		if (status < 0)
		break;
		/* Resend the blocking lock request after a server reboot */
		if (resp->status == nlm_lck_denied_grace_period)
		continue;
		if (resp->status != nlm_lck_blocked)
		break;
		}