From 1298bf32d2d6ffb68033e22fe3ec54e1c73eb8e1 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@citi.umich.edu>
Date: Wed, 6 Feb 2008 15:05:12 -0500
Subject: [PATCH] --- yaml --- r: 114337 b: refs/heads/master c:
 d22b1cff099737f74f3ac5950094508b4cddec1e h: refs/heads/master i:   114335:
 356c5fe31c75078c17b80c3acadb827827a1678f v: v3

---
 [refs]                   | 2 +-
 trunk/fs/lockd/svclock.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index eff027b7a718..57dbd58987f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2b5028905226f85075a408b1118857c9aa48bb3
+refs/heads/master: d22b1cff099737f74f3ac5950094508b4cddec1e
diff --git a/trunk/fs/lockd/svclock.c b/trunk/fs/lockd/svclock.c
index 808d246ada4d..6063a8e4b9f3 100644
--- a/trunk/fs/lockd/svclock.c
+++ b/trunk/fs/lockd/svclock.c
@@ -410,6 +410,10 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
 		ret = nlm_lck_denied_grace_period;
 		goto out;
 	}
+	if (reclaim && !locks_in_grace()) {
+		ret = nlm_lck_denied_grace_period;
+		goto out;
+	}
 
 	if (!wait)
 		lock->fl.fl_flags &= ~FL_SLEEP;