summaryrefslogtreecommitdiff
path: root/fs/lockd
diff options
context:
space:
mode:
authorBenjamin Coddington <bcodding@redhat.com>2015-10-22 20:38:14 +0300
committerJeff Layton <jeff.layton@primarydata.com>2015-10-22 21:57:36 +0300
commit4f6563677ae833baad8003e14353241bc25da4fc (patch)
tree6b54bdaa39f67c13cea45933dedc39f138051de9 /fs/lockd
parente55c34a66f87e78fb1fc6b623b78c5ad74b475af (diff)
downloadlinux-4f6563677ae833baad8003e14353241bc25da4fc.tar.xz
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>
Diffstat (limited to 'fs/lockd')
-rw-r--r--fs/lockd/clntproc.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index acd394716349..112952037933 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -474,18 +474,7 @@ static void nlmclnt_locks_init_private(struct file_lock *fl, struct nlm_host *ho
static int do_vfs_lock(struct file_lock *fl)
{
- int res = 0;
- switch (fl->fl_flags & (FL_POSIX|FL_FLOCK)) {
- case FL_POSIX:
- res = posix_lock_file_wait(fl->fl_file, fl);
- break;
- case FL_FLOCK:
- res = flock_lock_file_wait(fl->fl_file, fl);
- break;
- default:
- BUG();
- }
- return res;
+ return locks_lock_file_wait(fl->fl_file, fl);
}
/*