diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2007-07-19 01:50:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 10:04:57 -0700 |
| commit | 275afcac9953ece0828972edeab9684cfe1a5ef3 (patch) | |
| tree | 47b485ee950a4b66a6845510bc9676c293ad545d /fs | |
| parent | ed2c12f323e8fafbc94f9bcfb924f9df36e64dc7 (diff) | |
| download | linux-stable-275afcac9953ece0828972edeab9684cfe1a5ef3.tar.gz linux-stable-275afcac9953ece0828972edeab9684cfe1a5ef3.tar.bz2 linux-stable-275afcac9953ece0828972edeab9684cfe1a5ef3.zip | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | 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 8f07f8d1bfa9..4f77f3caee97 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) |