diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-01-20 11:35:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-30 13:32:12 +0100 |
| commit | 9d5dbf57d66f410d35da822a115dfd57531950dc (patch) | |
| tree | 13f126e9e4e7754d795f9148d5889c31b2728921 | |
| parent | 29013e4f4b73e2f5ef39a443b05c231ac29c690f (diff) | |
| download | linux-stable-9d5dbf57d66f410d35da822a115dfd57531950dc.tar.gz linux-stable-9d5dbf57d66f410d35da822a115dfd57531950dc.tar.bz2 linux-stable-9d5dbf57d66f410d35da822a115dfd57531950dc.zip | |
futex: Use pi_state_update_owner() in put_pi_state()
commit 6ccc84f917d33312eb2846bd7b567639f585ad6d upstream
No point in open coding it. This way it gains the extra sanity checks.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | kernel/futex.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index cc60a7709e1d..51db499e8591 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -884,16 +884,10 @@ static void put_pi_state(struct futex_pi_state *pi_state) * and has cleaned up the pi_state already */ if (pi_state->owner) { - struct task_struct *owner; unsigned long flags; raw_spin_lock_irqsave(&pi_state->pi_mutex.wait_lock, flags); - owner = pi_state->owner; - if (owner) { - raw_spin_lock(&owner->pi_lock); - list_del_init(&pi_state->list); - raw_spin_unlock(&owner->pi_lock); - } + pi_state_update_owner(pi_state, NULL); rt_mutex_proxy_unlock(&pi_state->pi_mutex); raw_spin_unlock_irqrestore(&pi_state->pi_mutex.wait_lock, flags); } |