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 <[email protected]> Signed-off-by: Trond Myklebust <[email protected]> Cc: [email protected]
kyagi · Feb 19, 2013 · 666b3d8 · 666b3d8
1 parent 5a12cca
commit 666b3d8
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
@@ -550,6 +550,9 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)
 		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;
 	}