]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
io_uring/uring_cmd: remove dead req_has_async_data() check
authorJens Axboe <axboe@kernel.dk>
Wed, 12 Feb 2025 21:05:11 +0000 (14:05 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Feb 2025 13:01:20 +0000 (14:01 +0100)
[ Upstream commit 0edf1283a9d1419a2095b4fcdd95c11ac00a191c ]

Any uring_cmd always has async data allocated now, there's no reason to
check and clear a cached copy of the SQE.

Fixes: d10f19dff56e ("io_uring/uring_cmd: switch to always allocating async data")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
io_uring/uring_cmd.c

index 874f9e2defd58392efab53c4f4ce41d3dec7427b..b2ce4b561002711fca8307e51bf56bafdc33a141 100644 (file)
@@ -65,9 +65,6 @@ bool io_uring_try_cancel_uring_cmd(struct io_ring_ctx *ctx,
                        continue;
 
                if (cmd->flags & IORING_URING_CMD_CANCELABLE) {
-                       /* ->sqe isn't available if no async data */
-                       if (!req_has_async_data(req))
-                               cmd->sqe = NULL;
                        file->f_op->uring_cmd(cmd, IO_URING_F_CANCEL |
                                                   IO_URING_F_COMPLETE_DEFER);
                        ret = true;