tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Caleb Sander Mateos and committed by
Jens Axboe 7cb3a683 4adc13ed

+1 -2
+1 -2
io_uring/io_uring.c
··· 2949 2949 static_branch_inc(&io_key_has_sqarray); 2950 2950 2951 2951 if ((ctx->flags & IORING_SETUP_DEFER_TASKRUN) && 2952 - !(ctx->flags & IORING_SETUP_IOPOLL) && 2953 - !(ctx->flags & IORING_SETUP_SQPOLL)) 2952 + !(ctx->flags & IORING_SETUP_IOPOLL)) 2954 2953 ctx->task_complete = true; 2955 2954 2956 2955 if (ctx->task_complete || (ctx->flags & IORING_SETUP_IOPOLL))