diff options
| author | Marc Eshel <eshel@almaden.ibm.com> | 2007-02-21 06:55:18 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-05-06 23:39:00 +0200 |
| commit | 9d6a8c5c213e34c475e72b245a8eb709258e968c (patch) | |
| tree | 96110535c2bd9485129c0753a9e0f012083b220f /fs/fuse | |
| parent | locks: make ->lock release private data before returning in GETLK case (diff) | |
| download | linux-9d6a8c5c213e34c475e72b245a8eb709258e968c.tar.xz linux-9d6a8c5c213e34c475e72b245a8eb709258e968c.zip | |
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 <eshel@almaden.ibm.com>
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 2fd06927e851..acfad65a6e8e 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -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); |