[patch] afs: build fix

From: Ingo Molnar
Date: Thu Jul 19 2007 - 12:57:24 EST


Subject: afs: build fix
From: Ingo Molnar <mingo@xxxxxxx>

this fresh commit:

commit e8d6c554126b830217c5e9f549e0e21f865a0a8a
Author: David Howells <dhowells@xxxxxxxxxx>
Date: Sun Jul 15 23:40:12 2007 -0700

AFS: implement file locking

Implement file locking for AFS.

did not even build (in an allyesconfig) because it forgot to take this
recent commit into account:

commit 6d34ac199a4af5c678a3a8f3275aeb2586b72da3
Author: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
Date: Fri May 11 16:09:32 2007 -0400

locks: make posix_test_lock() interface more consistent

the fix is trivial.

Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
fs/afs/flock.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux/fs/afs/flock.c
===================================================================
--- linux.orig/fs/afs/flock.c
+++ linux/fs/afs/flock.c
@@ -456,7 +456,8 @@ static int afs_do_getlk(struct file *fil

/* 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)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/