diff options
| author | Davidlohr Bueso <dave@stgolabs.net> | 2021-02-26 20:50:28 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2021-03-11 21:19:17 +0300 |
| commit | a3f2428d2b9c9ca70f52818774a2f6e0e30a0f0b (patch) | |
| tree | 27eeae2bf99d9819869dd9030f8cd0c9962f9051 /kernel/futex.c | |
| parent | a1565aa4699847febfdfd6af3bf06ca17a9e16af (diff) | |
| download | linux-a3f2428d2b9c9ca70f52818774a2f6e0e30a0f0b.tar.xz | |
kernel/futex: Move hb unlock out of unqueue_me_pi()
This improves the code readability, and the locking more obvious
as it becomes symmetric for the caller.
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210226175029.50335-3-dave@stgolabs.net
Diffstat (limited to 'kernel/futex.c')
| -rw-r--r-- | kernel/futex.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index ee09995d707b..dcd6132485e1 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -2318,19 +2318,15 @@ retry: /* * PI futexes can not be requeued and must remove themself from the - * hash bucket. The hash bucket lock (i.e. lock_ptr) is held on entry - * and dropped here. + * hash bucket. The hash bucket lock (i.e. lock_ptr) is held. */ static void unqueue_me_pi(struct futex_q *q) - __releases(q->lock_ptr) { __unqueue_futex(q); BUG_ON(!q->pi_state); put_pi_state(q->pi_state); q->pi_state = NULL; - - spin_unlock(q->lock_ptr); } static int __fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q, @@ -2913,8 +2909,8 @@ no_block: if (res) ret = (res < 0) ? res : 0; - /* Unqueue and drop the lock */ unqueue_me_pi(&q); + spin_unlock(q.lock_ptr); goto out; out_unlock_put_key: @@ -3290,8 +3286,8 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, if (res) ret = (res < 0) ? res : 0; - /* Unqueue and drop the lock. */ unqueue_me_pi(&q); + spin_unlock(q.lock_ptr); } if (ret == -EINTR) { |