mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
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 <[email protected]>
Signed-off-by: Jeff Layton <[email protected]>
Acked-by: J. Bruce Fields <[email protected]>
Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
parent
f891a29f46
commit
1a9e64a711
3 changed files with 2 additions and 8 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
|
||||
|
|
|
|||
Loading…
Reference in a new issue