mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
locks: give posix_test_lock same interface as ->lock
posix_test_lock() and ->lock() do the same job but have gratuitously different interfaces. Modify posix_test_lock() so the two agree, simplifying some code in the process. Signed-off-by: Marc Eshel <[email protected]> Signed-off-by: "J. Bruce Fields" <[email protected]>
This commit is contained in:
parent
70cc6487a4
commit
9d6a8c5c21
8 changed files with 32 additions and 51 deletions
|
|
@ -738,8 +738,7 @@ static int fuse_file_lock(struct file *file, int cmd, struct file_lock *fl)
|
|||
|
||||
if (cmd == F_GETLK) {
|
||||
if (fc->no_lock) {
|
||||
if (!posix_test_lock(file, fl, fl))
|
||||
fl->fl_type = F_UNLCK;
|
||||
posix_test_lock(file, fl);
|
||||
err = 0;
|
||||
} else
|
||||
err = fuse_getlk(file, fl);
|
||||
|
|
|
|||
Loading…
Reference in a new issue