diff mbox series

[08/10] futex: Use pi_state_update_owner() in put_pi_state()

Message ID 20210203134539.2583943-9-lee.jones@linaro.org
State Superseded
Headers show
Series Futex back-port | expand

Commit Message

Lee Jones Feb. 3, 2021, 1:45 p.m. UTC 
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>

---
 kernel/futex.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

-- 
2.25.1
diff mbox series

Patch

diff --git a/kernel/futex.c b/kernel/futex.c
index 40b9ba24bd9a0..be5e3e927bffa 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -879,10 +879,7 @@  static void put_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);
 	}