summaryrefslogtreecommitdiffstats
path: root/fs/locks.c
diff options
context:
space:
mode:
authorBenjamin Coddington <bcodding@redhat.com>2015-10-22 13:38:14 -0400
committerJeff Layton <jeff.layton@primarydata.com>2015-10-22 14:57:36 -0400
commit4f6563677ae833baad8003e14353241bc25da4fc (patch)
tree6b54bdaa39f67c13cea45933dedc39f138051de9 /fs/locks.c
parente55c34a66f87e78fb1fc6b623b78c5ad74b475af (diff)
downloadop-kernel-dev-4f6563677ae833baad8003e14353241bc25da4fc.zip
op-kernel-dev-4f6563677ae833baad8003e14353241bc25da4fc.tar.gz
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/locks.c')
-rw-r--r--fs/locks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c
index c174511..4667f82 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1961,7 +1961,7 @@ SYSCALL_DEFINE2(flock, unsigned int, fd, unsigned int, cmd)
(can_sleep) ? F_SETLKW : F_SETLK,
lock);
else
- error = flock_lock_file_wait(f.file, lock);
+ error = locks_lock_file_wait(f.file, lock);
out_free:
locks_free_lock(lock);
OpenPOWER on IntegriCloud