locks: give posix_test_lock same interface as ->lock

posix_test_lock() and ->lock() do the same job but have gratuitously
different interfaces.  Modify posix_test_lock() so the two agree,
simplifying some code in the process.

Signed-off-by: Marc Eshel <eshel@almaden.ibm.com>
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>

1 files changed, 1 insertions, 2 deletions

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 2fd06927e85..acfad65a6e8 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -738,8 +738,7 @@ static int fuse_file_lock(struct file *file, int cmd, struct file_lock *fl)
 
         if (cmd == F_GETLK) {
                 if (fc->no_lock) {
-                        if (!posix_test_lock(file, fl, fl))
-                                fl->fl_type = F_UNLCK;
+                        posix_test_lock(file, fl);
                         err = 0;
                 } else
                         err = fuse_getlk(file, fl);