diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-01-20 11:35:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-30 13:31:16 +0100 |
| commit | 51b7a7338bae3db42904ace1595061fb56b4de57 (patch) | |
| tree | 12d536c3e1707ff6922630bc2baff595def51302 /kernel | |
| parent | 348a99a76b07102475a7d4768de0e5a68851043e (diff) | |
| download | linux-rt-51b7a7338bae3db42904ace1595061fb56b4de57.tar.gz | |
futex: Use pi_state_update_owner() in put_pi_state()
commit 6ccc84f917d33312eb2846bd7b567639f585ad6d upstream
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/futex.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 35042003ff09..eaf41197fd54 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -884,16 +884,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); } |