diff mbox series

[tip:,locking/urgent] futex: Use pi_state_update_owner() in put_pi_state()

Message ID 161169149587.414.5977354859259738218.tip-bot2@tip-bot2
State New
Headers show
Series [tip:,locking/urgent] futex: Use pi_state_update_owner() in put_pi_state() | expand

Commit Message

thermal-bot for Julien Panis Jan. 26, 2021, 8:04 p.m. UTC 
The following commit has been merged into the locking/urgent branch of tip:

Commit-ID:     6ccc84f917d33312eb2846bd7b567639f585ad6d
Gitweb:        https://git.kernel.org/tip/6ccc84f917d33312eb2846bd7b567639f585ad6d
Author:        Thomas Gleixner <tglx@linutronix.de>
AuthorDate:    Wed, 20 Jan 2021 11:35:19 +01:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 26 Jan 2021 15:10:59 +01:00

futex: Use pi_state_update_owner() in put_pi_state()

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
---
 kernel/futex.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/kernel/futex.c b/kernel/futex.c
index cfca221..a0fe63c 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -808,16 +808,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);
 	}