Messages in this thread Patch in this message | | | Date | Sat, 19 Dec 2015 20:07:41 -0000 | From | Thomas Gleixner <> | Subject | [patch 5/5] futex: Cleanup the goto confusion in requeue_pi() |
| |
out_unlock: does not only drop the locks, it also drops the refcount on the pi_state. Really intuitive.
Move the label after the put_pi_state() call and use 'break' in the error handling path of the requeue loop.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- kernel/futex.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
--- a/kernel/futex.c +++ b/kernel/futex.c @@ -1842,20 +1842,21 @@ static int futex_requeue(u32 __user *uad */ this->pi_state = NULL; put_pi_state(pi_state); - goto out_unlock; + break; } } requeue_futex(this, hb1, hb2, &key2); drop_count++; } -out_unlock: /* * We took an extra initial reference to the pi_state either * in futex_proxy_trylock_atomic() or in lookup_pi_state(). We * need to drop it here again. */ put_pi_state(pi_state); + +out_unlock: double_unlock_hb(hb1, hb2); wake_up_q(&wake_q); hb_waiters_dec(hb2);
| |