cifs: use posix_unblock_lock instead of locks_delete_block
authorJeff Layton <jlayton@redhat.com>
Fri, 21 Jun 2013 12:58:10 +0000 (08:58 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 29 Jun 2013 08:57:38 +0000 (12:57 +0400)
commit1a9e64a7118c5ad13dd5119da18375a5bd45b330
tree823bc4983b7581c0096b0c3421eab86f41e1953d
parentf891a29f46553a384edbaa0f6ac446b1d03bccac
cifs: use posix_unblock_lock instead of locks_delete_block

commit 66189be74 (CIFS: Fix VFS lock usage for oplocked files) exported
the locks_delete_block symbol. There's already an exported helper
function that provides this capability however, so make cifs use that
instead and turn locks_delete_block back into a static function.

Note that if fl->fl_next == NULL then this lock has already been through
locks_delete_block(), so we should be OK to ignore an ENOENT error here
and simply not retry the lock.

Cc: Pavel Shilovsky <piastryyy@gmail.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Acked-by: J. Bruce Fields <bfields@fieldses.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/cifs/file.c
fs/locks.c
include/linux/fs.h