Move locks API users to locks_lock_inode_wait()

Instead of having users check for FL_POSIX or FL_FLOCK to call the correct
locks API function, use the check within locks_lock_inode_wait().  This
allows for some later cleanup.

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index cf4ab89159f4..9287a2d17b8c 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -1000,7 +1000,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
         }
         if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) {
                 if (fl->fl_type == F_UNLCK)
-                        posix_lock_file_wait(file, fl);
+                        locks_lock_file_wait(file, fl);
                 return -EIO;
         }
         if (IS_GETLK(cmd))
@@ -1031,7 +1031,7 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl)
         if (gl) {
                 if (fl_gh->gh_state == state)
                         goto out;
-                flock_lock_file_wait(file,
+                locks_lock_file_wait(file,
                                      &(struct file_lock){.fl_type = F_UNLCK});
                 gfs2_glock_dq(fl_gh);
                 gfs2_holder_reinit(state, flags, fl_gh);
@@ -1056,7 +1056,7 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl)
                 if (error == GLR_TRYFAILED)
                         error = -EAGAIN;
         } else {
-                error = flock_lock_file_wait(file, fl);
+                error = locks_lock_file_wait(file, fl);
                 gfs2_assert_warn(GFS2_SB(&ip->i_inode), !error);
         }
 
@@ -1071,7 +1071,7 @@ static void do_unflock(struct file *file, struct file_lock *fl)
         struct gfs2_holder *fl_gh = &fp->f_fl_gh;
 
         mutex_lock(&fp->f_fl_mutex);
-        flock_lock_file_wait(file, fl);
+        locks_lock_file_wait(file, fl);
         if (fl_gh->gh_gl) {
                 gfs2_glock_dq(fl_gh);
                 gfs2_holder_uninit(fl_gh);