diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-06-23 09:38:26 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-07-17 10:05:48 -0600 |
| commit | 3a372b66923e4af966af2900da588e3b3de6fcd2 (patch) | |
| tree | ee964de8edbe2e3c069a0f61aa1e572e98c3281b /io_uring | |
| parent | aa5cd116f3c25c05e4724d7b5e24dc9ed9020a12 (diff) | |
io_uring/cancel: fix sequence matching for IORING_ASYNC_CANCEL_ANY
We always need to check/update the cancel sequence if
IORING_ASYNC_CANCEL_ALL is set. Also kill the redundant check for
IORING_ASYNC_CANCEL_ANY at the end, if we get here we know it's
not set as we would've matched it higher up.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/cancel.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/io_uring/cancel.c b/io_uring/cancel.c index 8527ec3cc11f..bf44563d687d 100644 --- a/io_uring/cancel.c +++ b/io_uring/cancel.c @@ -35,7 +35,7 @@ bool io_cancel_req_match(struct io_kiocb *req, struct io_cancel_data *cd) if (req->ctx != cd->ctx) return false; if (cd->flags & IORING_ASYNC_CANCEL_ANY) { - ; + goto check_seq; } else if (cd->flags & IORING_ASYNC_CANCEL_FD) { if (req->file != cd->file) return false; @@ -43,7 +43,8 @@ bool io_cancel_req_match(struct io_kiocb *req, struct io_cancel_data *cd) if (req->cqe.user_data != cd->data) return false; } - if (cd->flags & (IORING_ASYNC_CANCEL_ALL|IORING_ASYNC_CANCEL_ANY)) { + if (cd->flags & IORING_ASYNC_CANCEL_ALL) { +check_seq: if (cd->seq == req->work.cancel_seq) return false; req->work.cancel_seq = cd->seq; |