Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d245cfa1 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: 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: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 6ccc84f917d33312eb2846bd7b567639f585ad6d)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic34513518cd4996b3eb4cb82b669d727be522597
parent cfe591bb

kernel/futex.c

+1 −7
Original line number Diff line number Diff line
@@ -903,16 +903,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);

	}