From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 19 Jul 2007 08:50:35 +0000 (-0700)
Subject: afs build fix
X-Git-Tag: v2.6.23-rc1~267
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=v2.6.22-3478-g275afca;p=linux-2.6-omap-h63xx.git

afs build fix

Bruce and David's patches clashed.

fs/afs/flock.c: In function 'afs_do_getlk':
fs/afs/flock.c:459: error: void value not ignored as it ought to be

Cc: "J. Bruce Fields" <bfields@fieldses.org>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/fs/afs/flock.c b/fs/afs/flock.c
index 8f07f8d1bfa..4f77f3caee9 100644
--- a/fs/afs/flock.c
+++ b/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)