---

yaml --- r: 114337 b: refs/heads/master c: d22b1cf h: refs/heads/master i: 114335: 356c5fe v: v3
git-mirror · Oct 3, 2008 · 1298bf3 · 1298bf3
1 parent 689ad28
commit 1298bf3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;