commit 75575ddf29cbbf8e3c96fb02ae80a33f22054aad
author Jeff Layton <jlayton@redhat.com> Sat Sep 17 18:17:32 2016 -0400
committer Anna Schumaker <Anna.Schumaker@Netapp.com> Thu Sep 22 13:56:04 2016 -0400
tree 7a176837c9913f62f950c12a7e2b40a56afef249
parent b60475c9401bf89a2b14918fca0a220a15867ace

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>

fs/nfs/file.c

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 580d1c5..3f1c623 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -710,11 +710,6 @@
 	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 @@
 	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 @@
 	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;