Commit-ID: 4959f2de11ca532a120a337429e5576fd283700f Gitweb: http://git.kernel.org/tip/4959f2de11ca532a120a337429e5576fd283700f Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Sat, 19 Dec 2015 20:07:40 +0000 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> 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 <tglx@xxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Darren Hart <darren@xxxxxxxxxx> Cc: Davidlohr Bueso <dave@xxxxxxxxxxxx> Cc: Bhuvanesh_Surachari@xxxxxxxxxx Cc: Andy Lowe <Andy_Lowe@xxxxxxxxxx> Link: http://lkml.kernel.org/r/20151219200607.432780944@xxxxxxxxxxxxx Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> --- 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); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|