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();
 
 		/*