Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=275afcac9953ece0828972edeab9684cfe1a5ef3 Commit: 275afcac9953ece0828972edeab9684cfe1a5ef3 Parent: ed2c12f323e8fafbc94f9bcfb924f9df36e64dc7 Author: Andrew Morton <[EMAIL PROTECTED]> AuthorDate: Thu Jul 19 01:50:35 2007 -0700 Committer: Linus Torvalds <[EMAIL PROTECTED]> CommitDate: Thu Jul 19 10:04:57 2007 -0700
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" <[EMAIL PROTECTED]> Acked-by: David Howells <[EMAIL PROTECTED]> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]> --- fs/afs/flock.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fs/afs/flock.c b/fs/afs/flock.c index 8f07f8d..4f77f3c 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) - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html