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>

2 files changed, 2 insertions, 13 deletions

diff --git a/fs/gfs2/locking/nolock/main.c b/fs/gfs2/locking/nolock/main.c
index acfbc941f319..5cc1dfa7944a 100644
--- a/fs/gfs2/locking/nolock/main.c
+++ b/fs/gfs2/locking/nolock/main.c
@@ -164,13 +164,7 @@ static void nolock_unhold_lvb(void *lock, char *lvb)
 static int nolock_plock_get(void *lockspace, struct lm_lockname *name,
                             struct file *file, struct file_lock *fl)
 {
-        struct file_lock tmp;
-        int ret;
-
-        ret = posix_test_lock(file, fl, &tmp);
-        fl->fl_type = F_UNLCK;
-        if (ret)
-                memcpy(fl, &tmp, sizeof(struct file_lock));
+        posix_test_lock(file, fl);
 
         return 0;
 }
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index b50180e22779..48b248d7c823 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -513,12 +513,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
 
         if (sdp->sd_args.ar_localflocks) {
                 if (IS_GETLK(cmd)) {
-                        struct file_lock tmp;
-                        int ret;
-                        ret = posix_test_lock(file, fl, &tmp);
-                        fl->fl_type = F_UNLCK;
-                        if (ret)
-                                memcpy(fl, &tmp, sizeof(struct file_lock));
+                        posix_test_lock(file, fl);
                         return 0;
                 } else {
                         return posix_lock_file_wait(file, fl);