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, 2 insertions, 2 deletions

diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 3abc447783aa..f23fd86697ea 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -161,7 +161,7 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl)
         if ((fl->fl_flags & FL_POSIX) != FL_POSIX)
                 BUG();
 
-        res = posix_lock_file_wait(filp, fl);
+        res = locks_lock_file_wait(filp, fl);
         if (res < 0)
                 goto out;
 
@@ -231,7 +231,7 @@ out_unlock:
         if (res < 0 && fl->fl_type != F_UNLCK) {
                 fl_type = fl->fl_type;
                 fl->fl_type = F_UNLCK;
-                res = posix_lock_file_wait(filp, fl);
+                res = locks_lock_file_wait(filp, fl);
                 fl->fl_type = fl_type;
         }
 out: