Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4959f2de authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Darren Hart <darren@dvhart.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Bhuvanesh_Surachari@mentor.com
Cc: Andy Lowe <Andy_Lowe@mentor.com>
Link: http://lkml.kernel.org/r/20151219200607.432780944@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ecb38b78

kernel/futex.c

+2 −4
Original line number Diff line number Diff line
@@ -1735,9 +1735,9 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags, 
		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 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags, 
			 *   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);