diff options
| author | NeilBrown <neilb@suse.com> | 2018-11-30 10:04:08 +1100 |
|---|---|---|
| committer | Jeff Layton <jlayton@kernel.org> | 2018-12-07 06:50:56 -0500 |
| commit | cb03f94ffb070b13bc0fa58b4ef4fdb558418d27 (patch) | |
| tree | 6472abe321bfeef600939937f24cb423453847ad /fs/cifs | |
| parent | fd7732e033e30b3a586923b57e338c859e17858a (diff) | |
fs/locks: merge posix_unblock_lock() and locks_delete_block()
posix_unblock_lock() is not specific to posix locks, and behaves
nearly identically to locks_delete_block() - the former returning a
status while the later doesn't.
So discard posix_unblock_lock() and use locks_delete_block() instead,
after giving that function an appropriate return value.
Signed-off-by: NeilBrown <neilb@suse.com>
Reviewed-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index d7ed895e05d1..94c3575e850c 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1106,7 +1106,7 @@ try_again: rc = wait_event_interruptible(flock->fl_wait, !flock->fl_blocker); if (!rc) goto try_again; - posix_unblock_lock(flock); + locks_delete_block(flock); } return rc; } |