From: Jeff Layton Date: Fri, 21 Jun 2013 12:58:10 +0000 (-0400) Subject: cifs: use posix_unblock_lock instead of locks_delete_block X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~42^2~22 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a9e64a7118c5ad13dd5119da18375a5bd45b330;p=pandora-kernel.git 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 Signed-off-by: Jeff Layton Acked-by: J. Bruce Fields Signed-off-by: Al Viro --- Reading git-diff-tree failed