mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
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>
This commit is contained in:
parent
ed2c12f323
commit
275afcac99
1 changed files with 2 additions and 1 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue