]> git.ipfire.org Git - thirdparty/linux.git/commit - include/linux/fs.h
fs/locks: merge posix_unblock_lock() and locks_delete_block()
authorNeilBrown <neilb@suse.com>
Thu, 29 Nov 2018 23:04:08 +0000 (10:04 +1100)
committerJeff Layton <jlayton@kernel.org>
Fri, 7 Dec 2018 11:50:56 +0000 (06:50 -0500)
commitcb03f94ffb070b13bc0fa58b4ef4fdb558418d27
tree6472abe321bfeef600939937f24cb423453847ad
parentfd7732e033e30b3a586923b57e338c859e17858a
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>
fs/cifs/file.c
fs/lockd/svclock.c
fs/locks.c
fs/nfsd/nfs4state.c
include/linux/fs.h