From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933435AbbLTNU6 (ORCPT ); Sun, 20 Dec 2015 08:20:58 -0500 Received: from terminus.zytor.com ([198.137.202.10]:49655 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932948AbbLTNUR (ORCPT ); Sun, 20 Dec 2015 08:20:17 -0500 Date: Sun, 20 Dec 2015 05:19:42 -0800 From: tip-bot for Thomas Gleixner Message-ID: Cc: linux-kernel@vger.kernel.org, dave@stgolabs.net, mingo@kernel.org, darren@dvhart.com, Andy_Lowe@mentor.com, tglx@linutronix.de, hpa@zytor.com, peterz@infradead.org Reply-To: peterz@infradead.org, darren@dvhart.com, Andy_Lowe@mentor.com, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, dave@stgolabs.net In-Reply-To: <20151219200607.432780944@linutronix.de> References: <20151219200607.432780944@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/core] futex: Remove pointless put_pi_state calls in requeue() Git-Commit-ID: 4959f2de11ca532a120a337429e5576fd283700f 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 Commit-ID: 4959f2de11ca532a120a337429e5576fd283700f Gitweb: http://git.kernel.org/tip/4959f2de11ca532a120a337429e5576fd283700f Author: Thomas Gleixner AuthorDate: Sat, 19 Dec 2015 20:07:40 +0000 Committer: Thomas Gleixner CommitDate: Sun, 20 Dec 2015 12:43:25 +0100 futex: Remove pointless put_pi_state calls in requeue() In the error handling cases we neither have pi_state nor a reference to it. Remove the pointless code. 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.432780944@linutronix.de Signed-off-by: Thomas Gleixner --- kernel/futex.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/futex.c b/kernel/futex.c index 20c4683..dcec018 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1735,9 +1735,9 @@ retry_private: case 0: /* We hold a reference on the pi state. */ break; + + /* If the above failed, then pi_state is NULL */ case -EFAULT: - put_pi_state(pi_state); - pi_state = NULL; double_unlock_hb(hb1, hb2); hb_waiters_dec(hb2); put_futex_key(&key2); @@ -1753,8 +1753,6 @@ retry_private: * exit to complete. * - The user space value changed. */ - put_pi_state(pi_state); - pi_state = NULL; double_unlock_hb(hb1, hb2); hb_waiters_dec(hb2); put_futex_key(&key2);