diff options
| author | Jeff Layton <jlayton@redhat.com> | 2016-09-18 01:17:32 +0300 |
|---|---|---|
| committer | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2016-09-22 20:56:04 +0300 |
| commit | 75575ddf29cbbf8e3c96fb02ae80a33f22054aad (patch) | |
| tree | 7a176837c9913f62f950c12a7e2b40a56afef249 /fs/nfs/file.c | |
| parent | b60475c9401bf89a2b14918fca0a220a15867ace (diff) | |
| download | linux-75575ddf29cbbf8e3c96fb02ae80a33f22054aad.tar.xz | |
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>
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 9 |
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; |