Commit 6795c5ab authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: clean up req->result setting by rw 



Assign req->result to io_size early in io_{read,write}(), it's enough
and makes it more straightforward.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9b0d911a

fs/io_uring.c

+2 −7
Original line number Diff line number Diff line
@@ -2384,7 +2384,6 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe, 


		kiocb->ki_flags |= IOCB_HIPRI;

		kiocb->ki_complete = io_complete_rw_iopoll;

		req->result = 0;

		req->iopoll_completed = 0;

	} else {

		if (kiocb->ki_flags & IOCB_HIPRI)
@@ -2957,9 +2956,7 @@ static int io_read(struct io_kiocb *req, bool force_nonblock, 
	if (!force_nonblock)

		kiocb->ki_flags &= ~IOCB_NOWAIT;



	req->result = 0;

	io_size = ret;

	if (req->flags & REQ_F_LINK_HEAD)

	req->result = io_size;



	/* If the file doesn't support async, just async punt */
@@ -3054,9 +3051,7 @@ static int io_write(struct io_kiocb *req, bool force_nonblock, 
	if (!force_nonblock)

		req->rw.kiocb.ki_flags &= ~IOCB_NOWAIT;



	req->result = 0;

	io_size = ret;

	if (req->flags & REQ_F_LINK_HEAD)

	req->result = io_size;



	/* If the file doesn't support async, just async punt */