diff options
| author | Benjamin Coddington <bcodding@redhat.com> | 2015-10-22 13:38:14 -0400 |
|---|---|---|
| committer | Jeff Layton <jeff.layton@primarydata.com> | 2015-10-22 14:57:36 -0400 |
| commit | 4f6563677ae833baad8003e14353241bc25da4fc (patch) | |
| tree | 6b54bdaa39f67c13cea45933dedc39f138051de9 /fs/locks.c | |
| parent | e55c34a66f87e78fb1fc6b623b78c5ad74b475af (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c index c1745119fc5b..4667f8226747 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); |