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>
This commit is contained in:

committed by
Jeff Layton

parent
e55c34a66f
commit
4f6563677a
@@ -1553,7 +1553,7 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u32 type,
|
||||
|
||||
out:
|
||||
if (flock->fl_flags & FL_POSIX && !rc)
|
||||
rc = posix_lock_file_wait(file, flock);
|
||||
rc = locks_lock_file_wait(file, flock);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user