summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2021-02-03 13:45:37 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-02-10 09:09:24 +0100
commit7d455bb66ae87ea11af3630cb546d74c35fb6b7e (patch)
tree946e2279d6765f7c1214ed2bfb460e6afeb6034c /kernel
parent285b624ec7818a43b96568a45ed7844a78eccd97 (diff)
downloadlinux-stable-7d455bb66ae87ea11af3630cb546d74c35fb6b7e.tar.gz
linux-stable-7d455bb66ae87ea11af3630cb546d74c35fb6b7e.tar.bz2
linux-stable-7d455bb66ae87ea11af3630cb546d74c35fb6b7e.zip
futex: Use pi_state_update_owner() in put_pi_state()
[ 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 40b9ba24bd9a..be5e3e927bff 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);
}