Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933409AbbLTNUg (ORCPT ); Sun, 20 Dec 2015 08:20:36 -0500 Received: from terminus.zytor.com ([198.137.202.10]:49672 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751091AbbLTNUd (ORCPT ); Sun, 20 Dec 2015 08:20:33 -0500 Date: Sun, 20 Dec 2015 05:20:01 -0800 From: tip-bot for Thomas Gleixner Message-ID: Cc: hpa@zytor.com, peterz@infradead.org, tglx@linutronix.de, dave@stgolabs.net, Andy_Lowe@mentor.com, darren@dvhart.com, mingo@kernel.org, linux-kernel@vger.kernel.org Reply-To: tglx@linutronix.de, dave@stgolabs.net, hpa@zytor.com, peterz@infradead.org, Andy_Lowe@mentor.com, darren@dvhart.com, linux-kernel@vger.kernel.org, mingo@kernel.org In-Reply-To: <20151219200607.526665141@linutronix.de> References: <20151219200607.526665141@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/core] futex: Cleanup the goto confusion in requeue_pi() Git-Commit-ID: 885c2cb770b5ac2507c41bc9f91a5d1c98337bee X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2012 Lines: 64 Commit-ID: 885c2cb770b5ac2507c41bc9f91a5d1c98337bee Gitweb: http://git.kernel.org/tip/885c2cb770b5ac2507c41bc9f91a5d1c98337bee Author: Thomas Gleixner AuthorDate: Sat, 19 Dec 2015 20:07:41 +0000 Committer: Thomas Gleixner CommitDate: Sun, 20 Dec 2015 12:43:25 +0100 futex: Cleanup the goto confusion in requeue_pi() out_unlock: does not only drop the locks, it also drops the refcount on the pi_state. Really intuitive. Move the label after the put_pi_state() call and use 'break' in the error handling path of the requeue loop. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: Darren Hart Cc: Davidlohr Bueso Cc: Bhuvanesh_Surachari@mentor.com Cc: Andy Lowe Link: http://lkml.kernel.org/r/20151219200607.526665141@linutronix.de Signed-off-by: Thomas Gleixner --- kernel/futex.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kernel/futex.c b/kernel/futex.c index dcec018..461d438 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1839,20 +1839,25 @@ retry_private: */ this->pi_state = NULL; put_pi_state(pi_state); - goto out_unlock; + /* + * We stop queueing more waiters and let user + * space deal with the mess. + */ + break; } } requeue_futex(this, hb1, hb2, &key2); drop_count++; } -out_unlock: /* * We took an extra initial reference to the pi_state either * in futex_proxy_trylock_atomic() or in lookup_pi_state(). We * need to drop it here again. */ put_pi_state(pi_state); + +out_unlock: double_unlock_hb(hb1, hb2); wake_up_q(&wake_q); hb_waiters_dec(hb2); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/