diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-25 11:10:08 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-25 11:10:08 +0300 |
| commit | 94ec70880fd376dd5cc60ba2bd7ddf830b3d4f28 (patch) | |
| tree | f0cb51c5eeadc2927c648b49c713f10809db5fd5 /io_uring | |
| parent | cdb7d2d68cde6145a06a56c9d5d5d917297501c6 (diff) | |
| parent | 78272d44970c07899c78661f6b7492b5a7e14a90 (diff) | |
| download | linux-94ec70880fd376dd5cc60ba2bd7ddf830b3d4f28.tar.xz | |
Merge branch 'locking/futex' into locking/core, to pick up pending futex changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/futex.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/io_uring/futex.c b/io_uring/futex.c index 0ea4820cd8ff..e89c0897117a 100644 --- a/io_uring/futex.c +++ b/io_uring/futex.c @@ -273,7 +273,6 @@ int io_futex_wait(struct io_kiocb *req, unsigned int issue_flags) struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex); struct io_ring_ctx *ctx = req->ctx; struct io_futex_data *ifd = NULL; - struct futex_hash_bucket *hb; int ret; if (!iof->futex_mask) { @@ -295,12 +294,11 @@ int io_futex_wait(struct io_kiocb *req, unsigned int issue_flags) ifd->req = req; ret = futex_wait_setup(iof->uaddr, iof->futex_val, iof->futex_flags, - &ifd->q, &hb); + &ifd->q, NULL, NULL); if (!ret) { hlist_add_head(&req->hash_node, &ctx->futex_list); io_ring_submit_unlock(ctx, issue_flags); - futex_queue(&ifd->q, hb, NULL); return IOU_ISSUE_SKIP_COMPLETE; } |