sugar/linux
1
0
Fork 0
Code Activity

fs/locks: merge posix_unblock_lock() and locks_delete_block()

Browse Source 
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>
This commit is contained in:
NeilBrown
2018-11-30 10:04:08 +11:00
committed by Jeff Layton
parent fd7732e033
commit cb03f94ffb
5 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/lockd/svclock.c
View File

@@ -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;
}