X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Flockd%2Fclntlock.c;h=de889223174a9e517cfc1436e01244f768f86f5a;hb=9f249188a2927b7809ed790e4b568ea82039d919;hp=8d4ea8351e3d4e093263104764d0f959aa35c05b;hpb=c522682d7433d27461d631d03a2a1a3b741e9c91;p=pandora-kernel.git

diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index 8d4ea8351e3d..de889223174a 100644
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -141,6 +141,9 @@ int nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout)
 			timeout);
 	if (ret < 0)
 		return -ERESTARTSYS;
+	/* Reset the lock status after a server reboot so we resend */
+	if (block->b_status == nlm_lck_denied_grace_period)
+		block->b_status = nlm_lck_blocked;
 	req->a_res.status = block->b_status;
 	return 0;
 }