From: Thomas Gleixner Date: Sun, 4 Oct 2009 07:34:17 +0000 (+0200) Subject: futex: Fix locking imbalance X-Git-Tag: v2.6.32-rc4~24^2~7 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaaea8036d0261d87d7072c5bc88c7ea730c18ac;p=pandora-kernel.git futex: Fix locking imbalance Rich reported a lock imbalance in the futex code: http://bugzilla.kernel.org/show_bug.cgi?id=14288 It's caused by the displacement of the retry_private label in futex_wake_op(). The code unlocks the hash bucket locks in the error handling path and retries without locking them again which makes the next unlock fail. Move retry_private so we lock the hash bucket locks when we retry. Reported-by: Rich Ercolany Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: Darren Hart Cc: stable-2.6.31 LKML-Reference: Signed-off-by: Ingo Molnar --- Reading git-diff-tree failed