From 2a48fe7acf670689220ba0549fbffee7736aae8d Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 19 Jul 2007 01:50:35 -0700
Subject: [PATCH] --- yaml --- r: 61736 b: refs/heads/master c:
 275afcac9953ece0828972edeab9684cfe1a5ef3 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/afs/flock.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0bfb3ce5c1d8..cedc2affc306 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed2c12f323e8fafbc94f9bcfb924f9df36e64dc7
+refs/heads/master: 275afcac9953ece0828972edeab9684cfe1a5ef3
diff --git a/trunk/fs/afs/flock.c b/trunk/fs/afs/flock.c
index 8f07f8d1bfa9..4f77f3caee97 100644
--- a/trunk/fs/afs/flock.c
+++ b/trunk/fs/afs/flock.c
@@ -456,7 +456,8 @@ static int afs_do_getlk(struct file *file, struct file_lock *fl)
 
 	/* check local lock records first */
 	ret = 0;
-	if (posix_test_lock(file, fl) == 0) {
+	posix_test_lock(file, fl);
+	if (fl->fl_type == F_UNLCK) {
 		/* no local locks; consult the server */
 		ret = afs_vnode_fetch_status(vnode, NULL, key);
 		if (ret < 0)