Rather than needing to duplicate this for the io_uring hook of futexes,
abstract out a helper.
No functional changes intended in this patch.
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
---
kernel/futex/futex.h | 17 +++++++++++++++++
kernel/futex/syscalls.c | 13 +++----------
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h
index b5379c0e6d6d..b8f454792304 100644
--- a/kernel/futex/futex.h
+++ b/kernel/futex/futex.h
@@ -291,4 +291,21 @@ extern int futex_unlock_pi(u32 __user *uaddr, unsigned int flags);
extern int futex_lock_pi(u32 __user *uaddr, unsigned int flags, ktime_t *time, int trylock);
+static inline bool futex_op_to_flags(int op, int cmd, unsigned int *flags)
+{
+ *flags = 0;
+
+ if (!(op & FUTEX_PRIVATE_FLAG))
+ *flags |= FLAGS_SHARED;
+
+ if (op & FUTEX_CLOCK_REALTIME) {
+ *flags |= FLAGS_CLOCKRT;
+ if (cmd != FUTEX_WAIT_BITSET && cmd != FUTEX_WAIT_REQUEUE_PI &&
+ cmd != FUTEX_LOCK_PI2)
+ return false;
+ }
+
+ return true;
+}
+
#endif /* _FUTEX_H */
diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c
index a8074079b09e..0b63d5bcdc77 100644
--- a/kernel/futex/syscalls.c
+++ b/kernel/futex/syscalls.c
@@ -86,17 +86,10 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout,
u32 __user *uaddr2, u32 val2, u32 val3)
{
int cmd = op & FUTEX_CMD_MASK;
- unsigned int flags = 0;
+ unsigned int flags;
- if (!(op & FUTEX_PRIVATE_FLAG))
- flags |= FLAGS_SHARED;
-
- if (op & FUTEX_CLOCK_REALTIME) {
- flags |= FLAGS_CLOCKRT;
- if (cmd != FUTEX_WAIT_BITSET && cmd != FUTEX_WAIT_REQUEUE_PI &&
- cmd != FUTEX_LOCK_PI2)
- return -ENOSYS;
- }
+ if (!futex_op_to_flags(op, cmd, &flags))
+ return -ENOSYS;
switch (cmd) {
case FUTEX_WAIT:
--
2.40.1
