diff options
| author | Jeff Layton <jlayton@redhat.com> | 2013-06-21 08:58:10 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-06-29 12:57:38 +0400 |
| commit | 1a9e64a7118c5ad13dd5119da18375a5bd45b330 (patch) | |
| tree | 823bc4983b7581c0096b0c3421eab86f41e1953d /fs/locks.c | |
| parent | f891a29f46553a384edbaa0f6ac446b1d03bccac (diff) | |
| download | op-kernel-dev-1a9e64a7118c5ad13dd5119da18375a5bd45b330.zip op-kernel-dev-1a9e64a7118c5ad13dd5119da18375a5bd45b330.tar.gz | |
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>
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -496,13 +496,12 @@ static void __locks_delete_block(struct file_lock *waiter) /* */ -void locks_delete_block(struct file_lock *waiter) +static void locks_delete_block(struct file_lock *waiter) { lock_flocks(); __locks_delete_block(waiter); unlock_flocks(); } -EXPORT_SYMBOL(locks_delete_block); /* Insert waiter into blocker's block list. * We use a circular list so that processes can be easily woken up in |
