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 <[email protected]>
Signed-off-by: Jeff Layton <[email protected]>
This commit is contained in:
Benjamin Coddington 2015-10-22 13:38:14 -04:00 • committed by Jeff Layton
commit 4f6563677a
12 changed files with 22 additions and 59 deletions

View file

@ -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);