diff options
| author | Jens Axboe <axboe@kernel.dk> | 2025-06-04 17:49:32 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-06-04 19:31:31 +0300 |
| commit | 6a8118a77eec5fc4dfec69cc6bdc52229943f6ef (patch) | |
| tree | 941e35a0718c2250dadd6f403a00308af61d30d1 | |
| parent | 607d09d1a01e9f29e91733e3a08b63ed240aacb2 (diff) | |
| download | linux-6a8118a77eec5fc4dfec69cc6bdc52229943f6ef.tar.xz | |
io_uring/futex: get rid of struct io_futex addr union
Rather than use a union of a u32 and struct futex_waitv user address,
consolidate it into a single void __user pointer instead. This also
makes prep easier to use as the store happens to the member that will
be used.
No functional changes in this patch.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | io_uring/futex.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/io_uring/futex.c b/io_uring/futex.c index fa374afbaa51..5a3991b0d1a7 100644 --- a/io_uring/futex.c +++ b/io_uring/futex.c @@ -14,10 +14,7 @@ struct io_futex { struct file *file; - union { - u32 __user *uaddr; - struct futex_waitv __user *uwaitv; - }; + void __user *uaddr; unsigned long futex_val; unsigned long futex_mask; unsigned long futexv_owned; @@ -186,7 +183,7 @@ int io_futexv_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) if (!futexv) return -ENOMEM; - ret = futex_parse_waitv(futexv, iof->uwaitv, iof->futex_nr, + ret = futex_parse_waitv(futexv, iof->uaddr, iof->futex_nr, io_futex_wakev_fn, req); if (ret) { kfree(futexv); |