Commit fc0ae024 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe

io_uring: init opcode in io_init_req()

Move io_req_prep() call inside of io_init_req(), it simplifies a bit
error handling for callers.
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/a0f59291fd52da4672c323542fd56fd899e23f8f.1633107393.git.asml.silence@gmail.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e0eb71dc
...@@ -6992,7 +6992,7 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req, ...@@ -6992,7 +6992,7 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req,
{ {
struct io_submit_state *state; struct io_submit_state *state;
unsigned int sqe_flags; unsigned int sqe_flags;
int personality, ret = 0; int personality;
/* req is partially pre-initialised, see io_preinit_req() */ /* req is partially pre-initialised, see io_preinit_req() */
req->opcode = READ_ONCE(sqe->opcode); req->opcode = READ_ONCE(sqe->opcode);
...@@ -7053,9 +7053,10 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req, ...@@ -7053,9 +7053,10 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req,
req->file = io_file_get(ctx, req, READ_ONCE(sqe->fd), req->file = io_file_get(ctx, req, READ_ONCE(sqe->fd),
(sqe_flags & IOSQE_FIXED_FILE)); (sqe_flags & IOSQE_FIXED_FILE));
if (unlikely(!req->file)) if (unlikely(!req->file))
ret = -EBADF; return -EBADF;
} }
return ret;
return io_req_prep(req, sqe);
} }
static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req, static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
...@@ -7067,7 +7068,6 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req, ...@@ -7067,7 +7068,6 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
ret = io_init_req(ctx, req, sqe); ret = io_init_req(ctx, req, sqe);
if (unlikely(ret)) { if (unlikely(ret)) {
fail_req:
trace_io_uring_req_failed(sqe, ret); trace_io_uring_req_failed(sqe, ret);
/* fail even hard links since we don't submit */ /* fail even hard links since we don't submit */
...@@ -7092,10 +7092,6 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req, ...@@ -7092,10 +7092,6 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
return ret; return ret;
} }
req_fail_link_node(req, ret); req_fail_link_node(req, ret);
} else {
ret = io_req_prep(req, sqe);
if (unlikely(ret))
goto fail_req;
} }
/* don't need @sqe from now on */ /* don't need @sqe from now on */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment