Commit a196c78b authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring: assign non-fixed early for async work 



We defer file assignment to ensure that fixed files work with links
between a direct accept/open and the links that follow it. But this has
the side effect that normal file assignment is then not complete by the
time that request submission has been done.

For deferred execution, if the file is a regular file, assign it when
we do the async prep anyway.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 303cc749

fs/io_uring.c

+6 −1
Original line number Diff line number Diff line
@@ -6947,7 +6947,12 @@ static int io_req_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 


static int io_req_prep_async(struct io_kiocb *req)

{

	if (!io_op_defs[req->opcode].needs_async_setup)

	const struct io_op_def *def = &io_op_defs[req->opcode];



	/* assign early for deferred execution for non-fixed file */

	if (def->needs_file && !(req->flags & REQ_F_FIXED_FILE))

		req->file = io_file_get_normal(req, req->fd);

	if (!def->needs_async_setup)

		return 0;

	if (WARN_ON_ONCE(req_has_async_data(req)))

		return -EFAULT;