From: Wengang Wang Date: Thu, 3 Apr 2014 21:47:09 +0000 (-0700) Subject: ocfs2: flock: drop cross-node lock when failed locally X-Git-Tag: v3.15-rc1~106^2~192 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e228f6439862359f9b26f9d62634e4fce180b54a;p=pandora-kernel.git ocfs2: flock: drop cross-node lock when failed locally ocfs2_do_flock() calls ocfs2_file_lock() to get the cross-node clock and then call flock_lock_file_wait() to compete with local processes. In case flock_lock_file_wait() failed, say -ENOMEM, clean up work is not done. This patch adds the cleanup --drop the cross-node lock which was just granted. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Wengang Wang Cc: Joel Becker Reviewed-by: Mark Fasheh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed