aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2013-02-19 12:04:42 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-28 06:32:25 -0800
commit8f0b9cb82a2d156297664de6e6df14afa39c5b7f (patch)
tree82224110b3344d13b73467609dc2035dd67ea0c5 /fs
parent78e47dce08b0dd37a001ee540cdb94fbeba89850 (diff)
downloadkernel_samsung_aries-8f0b9cb82a2d156297664de6e6df14afa39c5b7f.zip
kernel_samsung_aries-8f0b9cb82a2d156297664de6e6df14afa39c5b7f.tar.gz
kernel_samsung_aries-8f0b9cb82a2d156297664de6e6df14afa39c5b7f.tar.bz2
NLM: Ensure that we resend all pending blocking locks after a reclaim
commit 666b3d803a511fbc9bc5e5ea8ce66010cf03ea13 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/lockd/clntproc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index e374050..5ee055e 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -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;
}