From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Thu, 24 Jan 2008 16:11:34 +0000 (-0500)
Subject: locks: allow lockd to process blocked locks during grace period
X-Git-Tag: v2.6.28-rc1~576^2~37
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8fafa90082ab18859d97627fc454edf12f7efbff;p=linux-2.6-omap-h63xx.git

locks: allow lockd to process blocked locks during grace period

The check here is currently harmless but unnecessary, since, as the
comment notes, there aren't any blocked-lock callbacks to process
during the grace period anyway.

And eventually we want to allow multiple grace periods that come and go
for different filesystems over the course of the lifetime of lockd, at
which point this check is just going to get in the way.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 1553fecc567..bdc607bb25e 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -158,15 +158,9 @@ lockd(void *vrqstp)
 			continue;
 		}
 
-		/*
-		 * Retry any blocked locks that have been notified by
-		 * the VFS. Don't do this during grace period.
-		 * (Theoretically, there shouldn't even be blocked locks
-		 * during grace period).
-		 */
-		if (!nlmsvc_grace_period) {
-			timeout = nlmsvc_retry_blocked();
-		} else if (time_before(grace_period_expire, jiffies))
+		timeout = nlmsvc_retry_blocked();
+
+		if (time_before(grace_period_expire, jiffies))
 			clear_grace_period();
 
 		/*