Commit af92dcea authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

futex: Rename __unqueue_futex() 



In order to prepare introducing these symbols into the global
namespace; rename:

  s/__unqueue_futex/__futex_unqueue/g

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarAndré Almeida <andrealmeid@collabora.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarAndré Almeida <andrealmeid@collabora.com>
Link: https://lore.kernel.org/r/20210923171111.300673-7-andrealmeid@collabora.com
parent e7ba9c8f

kernel/futex/core.c

+7 −7
Original line number Diff line number Diff line
@@ -1470,12 +1470,12 @@ static int futex_lock_pi_atomic(u32 __user *uaddr, struct futex_hash_bucket *hb, 
}



/**

 * __unqueue_futex() - Remove the futex_q from its futex_hash_bucket

 * __futex_unqueue() - Remove the futex_q from its futex_hash_bucket

 * @q:	The futex_q to unqueue

 *

 * The q->lock_ptr must not be NULL and must be held by the caller.

 */

static void __unqueue_futex(struct futex_q *q)

static void __futex_unqueue(struct futex_q *q)

{

	struct futex_hash_bucket *hb;
@@ -1502,13 +1502,13 @@ static void mark_wake_futex(struct wake_q_head *wake_q, struct futex_q *q) 
		return;



	get_task_struct(p);

	__unqueue_futex(q);

	__futex_unqueue(q);

	/*

	 * The waiting task can free the futex_q as soon as q->lock_ptr = NULL

	 * is written, without taking any locks. This is possible in the event

	 * of a spurious wakeup, for example. A memory barrier is required here

	 * to prevent the following store to lock_ptr from getting ahead of the

	 * plist_del in __unqueue_futex().

	 * plist_del in __futex_unqueue().

	 */

	smp_store_release(&q->lock_ptr, NULL);
@@ -1958,7 +1958,7 @@ void requeue_pi_wake_futex(struct futex_q *q, union futex_key *key, 
{

	q->key = *key;



	__unqueue_futex(q);

	__futex_unqueue(q);



	WARN_ON(!q->rt_waiter);

	q->rt_waiter = NULL;
@@ -2522,7 +2522,7 @@ static int futex_unqueue(struct futex_q *q) 
			spin_unlock(lock_ptr);

			goto retry;

		}

		__unqueue_futex(q);

		__futex_unqueue(q);



		BUG_ON(q->pi_state);
@@ -2539,7 +2539,7 @@ static int futex_unqueue(struct futex_q *q) 
 */

static void futex_unqueue_pi(struct futex_q *q)

{

	__unqueue_futex(q);

	__futex_unqueue(q);



	BUG_ON(!q->pi_state);

	put_pi_state(q->pi_state);