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>

1 files changed, 3 insertions, 1 deletions

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 13ac6fa2b62b..c87dc713b5d7 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;
         }