Commit 3e577dcd authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: put the flag changing code in the same spot 



Both iocb_flags() and kiocb_set_rw_flags() are inline and modify
kiocb->ki_flags. Place them close, so they can be potentially better
optimised.

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

fs/io_uring.c

+4 −5
Original line number Diff line number Diff line
@@ -1867,8 +1867,11 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe, 
		req->flags |= REQ_F_CUR_POS;

		kiocb->ki_pos = req->file->f_pos;

	}

	kiocb->ki_flags = iocb_flags(kiocb->ki_filp);

	kiocb->ki_hint = ki_hint_validate(file_write_hint(kiocb->ki_filp));

	kiocb->ki_flags = iocb_flags(kiocb->ki_filp);

	ret = kiocb_set_rw_flags(kiocb, READ_ONCE(sqe->rw_flags));

	if (unlikely(ret))

		return ret;



	ioprio = READ_ONCE(sqe->ioprio);

	if (ioprio) {
@@ -1880,10 +1883,6 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe, 
	} else

		kiocb->ki_ioprio = get_current_ioprio();



	ret = kiocb_set_rw_flags(kiocb, READ_ONCE(sqe->rw_flags));

	if (unlikely(ret))

		return ret;



	/* don't allow async punt if RWF_NOWAIT was requested */

	if ((kiocb->ki_flags & IOCB_NOWAIT) ||

	    (req->file->f_flags & O_NONBLOCK))

CRA Git | Maintained and supported by SUSTech CRA and CCSE