From f6dc6644fc8d52432f3f06171fea00ef897679c7 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@citi.umich.edu>
Date: Thu, 24 Jan 2008 11:11:34 -0500
Subject: [PATCH] --- yaml --- r: 114311 b: refs/heads/master c:
 8fafa90082ab18859d97627fc454edf12f7efbff h: refs/heads/master i:   114309:
 8b791fc2cbff883b763cc3f993350456ac026f8b   114307:
 b78cf894b65b1966da0a917f7dd6b30b5e1d4616   114303:
 eab0809579de53677465f5e6e0e08b0b7591082f v: v3

---
 [refs]               |  2 +-
 trunk/fs/lockd/svc.c | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 7a152e87edee..07b0ba8925fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54a66e548079f12a6f54c3cae96812a9ed9b54ae
+refs/heads/master: 8fafa90082ab18859d97627fc454edf12f7efbff
diff --git a/trunk/fs/lockd/svc.c b/trunk/fs/lockd/svc.c
index 1553fecc567d..bdc607bb25e9 100644
--- a/trunk/fs/lockd/svc.c
+++ b/trunk/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();
 
 		/*