Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Andrew Morton and committed by
Linus Torvalds
275afcac ed2c12f3

+2 -1
+2 -1
fs/afs/flock.c
··· 456 456 457 457 /* check local lock records first */ 458 458 ret = 0; 459 - if (posix_test_lock(file, fl) == 0) { 459 + posix_test_lock(file, fl); 460 + if (fl->fl_type == F_UNLCK) { 460 461 /* no local locks; consult the server */ 461 462 ret = afs_vnode_fetch_status(vnode, NULL, key); 462 463 if (ret < 0)