Commit 991fb85a authored by Jens Axboe's avatar Jens Axboe
Browse files

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: default avatarGabriel Krisman Bertazi <krisman@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 09bd8442

io_uring/io_uring.c

+3 −1
Original line number Diff line number Diff line
@@ -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)