diff options
| author | peterz@infradead.org <peterz@infradead.org> | 2023-09-21 12:45:13 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2023-09-21 19:22:09 +0200 |
| commit | 3b63a55f498b763aba0886b244df613587a73c46 (patch) | |
| tree | 0d44fd2a24f770b5fc6298a993a3a7eb25e57523 /kernel/futex/requeue.c | |
| parent | cb8c4312afca1b2dc64107e7e7cea81911055612 (diff) | |
| download | linux-3b63a55f498b763aba0886b244df613587a73c46.tar.gz linux-3b63a55f498b763aba0886b244df613587a73c46.tar.bz2 linux-3b63a55f498b763aba0886b244df613587a73c46.zip | |
futex: Propagate flags into get_futex_key()
Instead of only passing FLAGS_SHARED as a boolean, pass down flags as
a whole.
No functional change intended.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20230921105248.282857501@noisy.programming.kicks-ass.net
Diffstat (limited to 'kernel/futex/requeue.c')
| -rw-r--r-- | kernel/futex/requeue.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/futex/requeue.c b/kernel/futex/requeue.c index 4c73e0b81acc..5bf69581a937 100644 --- a/kernel/futex/requeue.c +++ b/kernel/futex/requeue.c @@ -424,10 +424,10 @@ int futex_requeue(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, } retry: - ret = get_futex_key(uaddr1, flags & FLAGS_SHARED, &key1, FUTEX_READ); + ret = get_futex_key(uaddr1, flags, &key1, FUTEX_READ); if (unlikely(ret != 0)) return ret; - ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, + ret = get_futex_key(uaddr2, flags, &key2, requeue_pi ? FUTEX_WRITE : FUTEX_READ); if (unlikely(ret != 0)) return ret; @@ -789,7 +789,7 @@ int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, */ rt_mutex_init_waiter(&rt_waiter); - ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, FUTEX_WRITE); + ret = get_futex_key(uaddr2, flags, &key2, FUTEX_WRITE); if (unlikely(ret != 0)) goto out; |