diff options
| author | Benjamin Coddington <bcodding@redhat.com> | 2015-10-22 19:38:14 +0200 |
|---|---|---|
| committer | Jeff Layton <jeff.layton@primarydata.com> | 2015-10-22 20:57:36 +0200 |
| commit | 4f6563677ae833baad8003e14353241bc25da4fc (patch) | |
| tree | 6b54bdaa39f67c13cea45933dedc39f138051de9 /fs/nfs/file.c | |
| parent | locks: introduce locks_lock_inode_wait() (diff) | |
| download | linux-4f6563677ae833baad8003e14353241bc25da4fc.tar.xz linux-4f6563677ae833baad8003e14353241bc25da4fc.zip | |
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/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 13 |
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 |