forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

io_uring/waitid: use generic io_cancel_remove() helper

Browse source 
Don't implement our own loop rolling and checking, just use the generic
helper to find and cancel requests.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2025-02-05 13:16:29 -07:00
parent 2eaa2fac47
commit 932de5e35f
1 changed files with 1 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

24
io_uring/waitid.c
View file

@ -158,29 +158,7 @@ static bool __io_waitid_cancel(struct io_kiocb *req)
int io_waitid_cancel(struct io_ring_ctx *ctx, struct io_cancel_data *cd, int io_waitid_cancel(struct io_ring_ctx *ctx, struct io_cancel_data *cd,
unsigned int issue_flags) unsigned int issue_flags)
{ {
struct hlist_node *tmp; return io_cancel_remove(ctx, cd, issue_flags, &ctx->waitid_list, __io_waitid_cancel);
struct io_kiocb *req;
int nr = 0;
if (cd->flags & (IORING_ASYNC_CANCEL_FD|IORING_ASYNC_CANCEL_FD_FIXED))
return -ENOENT;
io_ring_submit_lock(ctx, issue_flags);
hlist_for_each_entry_safe(req, tmp, &ctx->waitid_list, hash_node) {
if (req->cqe.user_data != cd->data &&
!(cd->flags & IORING_ASYNC_CANCEL_ANY))
continue;
if (__io_waitid_cancel(req))
nr++;
if (!(cd->flags & IORING_ASYNC_CANCEL_ALL))
break;
}
io_ring_submit_unlock(ctx, issue_flags);
if (nr)
return nr;
return -ENOENT;
} }
bool io_waitid_remove_all(struct io_ring_ctx *ctx, struct io_uring_task *tctx, bool io_waitid_remove_all(struct io_ring_ctx *ctx, struct io_uring_task *tctx,