diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 15:07:40 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-12-20 06:43:25 -0500 |
commit | 4959f2de11ca532a120a337429e5576fd283700f (patch) | |
tree | 639195158230f704f031af2ab219a41107384da9 /kernel/futex.c | |
parent | ecb38b78f698a51988ec456751b20440e54702fb (diff) |
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 <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>
Diffstat (limited to 'kernel/futex.c')
-rw-r--r-- | kernel/futex.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 20c468356b90..dcec01856cf3 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
@@ -1735,9 +1735,9 @@ retry_private: | |||
1735 | case 0: | 1735 | case 0: |
1736 | /* We hold a reference on the pi state. */ | 1736 | /* We hold a reference on the pi state. */ |
1737 | break; | 1737 | break; |
1738 | |||
1739 | /* If the above failed, then pi_state is NULL */ | ||
1738 | case -EFAULT: | 1740 | case -EFAULT: |
1739 | put_pi_state(pi_state); | ||
1740 | pi_state = NULL; | ||
1741 | double_unlock_hb(hb1, hb2); | 1741 | double_unlock_hb(hb1, hb2); |
1742 | hb_waiters_dec(hb2); | 1742 | hb_waiters_dec(hb2); |
1743 | put_futex_key(&key2); | 1743 | put_futex_key(&key2); |
@@ -1753,8 +1753,6 @@ retry_private: | |||
1753 | * exit to complete. | 1753 | * exit to complete. |
1754 | * - The user space value changed. | 1754 | * - The user space value changed. |
1755 | */ | 1755 | */ |
1756 | put_pi_state(pi_state); | ||
1757 | pi_state = NULL; | ||
1758 | double_unlock_hb(hb1, hb2); | 1756 | double_unlock_hb(hb1, hb2); |
1759 | hb_waiters_dec(hb2); | 1757 | hb_waiters_dec(hb2); |
1760 | put_futex_key(&key2); | 1758 | put_futex_key(&key2); |