* [tip: locking/urgent] futex: Use pi_state_update_owner() in put_pi_state()
@ 2021-01-26 20:04 tip-bot2 for Thomas Gleixner
0 siblings, 0 replies; only message in thread
From: tip-bot2 for Thomas Gleixner @ 2021-01-26 20:04 UTC (permalink / raw)
To: linux-tip-commits
Cc: Thomas Gleixner, Peter Zijlstra (Intel), stable, x86, linux-kernel
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 --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);
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-01-27 5:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-26 20:04 [tip: locking/urgent] futex: Use pi_state_update_owner() in put_pi_state() tip-bot2 for Thomas Gleixner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).