nfs: eliminate pointless and confusing do_vfs_lock wrappers

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

1 files changed, 2 insertions, 7 deletions

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 580d1c588228..3f1c623eee39 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -710,11 +710,6 @@ out_noconflict:
         goto out;
 }
 
-static int do_vfs_lock(struct file *file, struct file_lock *fl)
-{
-        return locks_lock_file_wait(file, fl);
-}
-
 static int
 do_unlk(struct file *filp, int cmd, struct file_lock *fl, int is_local)
 {
@@ -747,7 +742,7 @@ do_unlk(struct file *filp, int cmd, struct file_lock *fl, int is_local)
         if (!is_local)
                 status = NFS_PROTO(inode)->lock(filp, cmd, fl);
         else
-                status = do_vfs_lock(filp, fl);
+                status = locks_lock_file_wait(filp, fl);
         return status;
 }
 
@@ -772,7 +767,7 @@ do_setlk(struct file *filp, int cmd, struct file_lock *fl, int is_local)
         if (!is_local)
                 status = NFS_PROTO(inode)->lock(filp, cmd, fl);
         else
-                status = do_vfs_lock(filp, fl);
+                status = locks_lock_file_wait(filp, fl);
         if (status < 0)
                 goto out;