diff options
| author | Thomas Gleixner | 2015-12-19 21:07:40 +0100 |
|---|---|---|
| committer | Thomas Gleixner | 2015-12-20 12:43:25 +0100 |
| commit | 4959f2de11ca532a120a337429e5576fd283700f (patch) | |
| tree | 639195158230f704f031af2ab219a41107384da9 /kernel/futex.c | |
| parent | futex: Document pi_state refcounting in requeue code (diff) | |
| download | kernel-qcow2-linux-4959f2de11ca532a120a337429e5576fd283700f.tar.gz kernel-qcow2-linux-4959f2de11ca532a120a337429e5576fd283700f.tar.xz kernel-qcow2-linux-4959f2de11ca532a120a337429e5576fd283700f.zip | |
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: 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); |