diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2007-05-11 16:09:32 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-07-18 19:17:19 -0400 |
| commit | 6d34ac199a4af5c678a3a8f3275aeb2586b72da3 (patch) | |
| tree | 4ab6cffcfe993baa0afb2ab361a8c94ebfc3a444 /fs/nfs | |
| parent | 370f6599e8bc03fd9fc6d1a1be00ae0c6373ca59 (diff) | |
| download | kernel_samsung_smdk4412-6d34ac199a4af5c678a3a8f3275aeb2586b72da3.zip kernel_samsung_smdk4412-6d34ac199a4af5c678a3a8f3275aeb2586b72da3.tar.gz kernel_samsung_smdk4412-6d34ac199a4af5c678a3a8f3275aeb2586b72da3.tar.bz2 | |
locks: make posix_test_lock() interface more consistent
Since posix_test_lock(), like fcntl() and ->lock(), indicates absence or
presence of a conflict lock by setting fl_type to, respectively, F_UNLCK
or something other than F_UNLCK, the return value is no longer needed.
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 13ac6fa..c87dc71 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -402,7 +402,9 @@ static int do_getlk(struct file *filp, int cmd, struct file_lock *fl) lock_kernel(); /* Try local locking first */ - if (posix_test_lock(filp, fl)) { + posix_test_lock(filp, fl); + if (fl->fl_type != F_UNLCK) { + /* found a conflict */ goto out; } |