Skip to content

Commit

Permalink
afs build fix
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Jul 19, 2007
1 parent ed2c12f commit 275afca
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion fs/afs/flock.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 275afca

Please sign in to comment.