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/lockd | |
| parent | fd7732e033e30b3a586923b57e338c859e17858a (diff) | |
| download | linux-cb03f94ffb070b13bc0fa58b4ef4fdb558418d27.tar.gz linux-cb03f94ffb070b13bc0fa58b4ef4fdb558418d27.tar.bz2 linux-cb03f94ffb070b13bc0fa58b4ef4fdb558418d27.zip | |
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/lockd')
| -rw-r--r-- | fs/lockd/svclock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 74330daeab71..ea719cdd6a36 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -276,7 +276,7 @@ static int nlmsvc_unlink_block(struct nlm_block *block) dprintk("lockd: unlinking block %p...\n", block); /* Remove block from list */ - status = posix_unblock_lock(&block->b_call->a_args.lock.fl); + status = locks_delete_block(&block->b_call->a_args.lock.fl); nlmsvc_remove_block(block); return status; } |