io_uring: simplify IORING_SETUP_DEFER_TASKRUN && !SQPOLL check

io_uring_sanitise_params() already rejects flags that include both
IORING_SETUP_SQPOLL and IORING_SETUP_DEFER_TASKRUN. So it's unnecessary
to check IORING_SETUP_SQPOLL in io_uring_create() when
IORING_SETUP_DEFER_TASKRUN has already been checked. Drop the
!(ctx->flags & IORING_SETUP_SQPOLL) check for the task_complete case.

Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 1d5bc669afd97ce8dd7e761d2f75711bce452bf9..3a7be1695c3927fe479d5ad0958568f26add0090 100644 (file)
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -2949,8 +2949,7 @@ static __cold int io_uring_create(struct io_ctx_config *config)
                static_branch_inc(&io_key_has_sqarray);
 
        if ((ctx->flags & IORING_SETUP_DEFER_TASKRUN) &&
-           !(ctx->flags & IORING_SETUP_IOPOLL) &&
-           !(ctx->flags & IORING_SETUP_SQPOLL))
+           !(ctx->flags & IORING_SETUP_IOPOLL))
                ctx->task_complete = true;
 
        if (ctx->task_complete || (ctx->flags & IORING_SETUP_IOPOLL))