summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2021-02-04 17:29:01 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-02-10 09:07:26 +0100
commitf08a4af5ccb2a907a225dfd3d882656e5473da4a (patch)
tree8d1c998acad80f3d97b85356ddb82aebdbfc2b67 /kernel
parent42255927e832f9c1ed8db4e84530bc6a54aa2fee (diff)
futex: Use pi_state_update_owner() in put_pi_state()
From: Thomas Gleixner <tglx@linutronix.de> [ Upstream commit 6ccc84f917d33312eb2846bd7b567639f585ad6d ] 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: Lee Jones <lee.jones@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/futex.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index bf40921ef120..d9bec8eb6096 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -874,10 +874,7 @@ static void free_pi_state(struct futex_pi_state *pi_state)
* and has cleaned up the pi_state already
*/
if (pi_state->owner) {
- raw_spin_lock_irq(&pi_state->owner->pi_lock);
- list_del_init(&pi_state->list);
- raw_spin_unlock_irq(&pi_state->owner->pi_lock);
-
+ pi_state_update_owner(pi_state, NULL);
rt_mutex_proxy_unlock(&pi_state->pi_mutex);
}