From: Jens Axboe Date: Mon, 12 Jan 2026 15:14:44 +0000 (-0700) Subject: io_uring: move ctx->restricted check into io_check_restriction() X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=991fb85a1d43f0d0237a405d5535024f78a873e5;p=thirdparty%2Flinux.git io_uring: move ctx->restricted check into io_check_restriction() Just a cleanup, makes the code easier to read without too many dependent nested checks. Reviewed-by: Gabriel Krisman Bertazi Signed-off-by: Jens Axboe --- diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index a1dd1540ab79d..92ed92a44023d 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -2056,6 +2056,8 @@ static inline bool io_check_restriction(struct io_ring_ctx *ctx, struct io_kiocb *req, unsigned int sqe_flags) { + if (!ctx->restricted) + return true; if (!test_bit(req->opcode, ctx->restrictions.sqe_op)) return false; @@ -2158,7 +2160,7 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req, } } if (unlikely(ctx->restricted || ctx->drain_active || ctx->drain_next)) { - if (ctx->restricted && !io_check_restriction(ctx, req, sqe_flags)) + if (!io_check_restriction(ctx, req, sqe_flags)) return io_init_fail_req(req, -EACCES); /* knock it to the slow queue path, will be drained there */ if (ctx->drain_active)