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, 1 insertions, 12 deletions

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index c0f9b1ed12b9..37f639d50af5 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -738,18 +738,7 @@ out_noconflict:
 
 static int do_vfs_lock(struct file *file, struct file_lock *fl)
 {
-        int res = 0;
-        switch (fl->fl_flags & (FL_POSIX|FL_FLOCK)) {
-                case FL_POSIX:
-                        res = posix_lock_file_wait(file, fl);
-                        break;
-                case FL_FLOCK:
-                        res = flock_lock_file_wait(file, fl);
-                        break;
-                default:
-                        BUG();
-        }
-        return res;
+        return locks_lock_file_wait(file, fl);
 }
 
 static int