Skip to content

Commit

Permalink
futex: Remove pointless put_pi_state calls in requeue()
Browse files Browse the repository at this point in the history
In the error handling cases we neither have pi_state nor a reference
to it. Remove the pointless code.

Signed-off-by: Thomas 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: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
KAGA-KOKO committed Dec 20, 2015
1 parent ecb38b7 commit 4959f2d
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions kernel/futex.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit 4959f2d

Please sign in to comment.