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

io_uring: set/clear IOCB_NOWAIT into io_read/write 



Move setting IOCB_NOWAIT from io_prep_rw() into io_read()/io_write(), so
it's set/cleared in a single place. Also remove @force_nonblock
parameter from io_prep_rw().

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

fs/io_uring.c

+9 −8
Original line number Diff line number Diff line
@@ -2633,8 +2633,7 @@ static bool io_file_supports_async(struct file *file, int rw) 
	return file->f_op->write_iter != NULL;

}



static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe,

		      bool force_nonblock)

static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

	struct io_ring_ctx *ctx = req->ctx;

	struct kiocb *kiocb = &req->rw.kiocb;
@@ -2669,9 +2668,6 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe, 
	if (kiocb->ki_flags & IOCB_NOWAIT)

		req->flags |= REQ_F_NOWAIT;



	if (force_nonblock)

		kiocb->ki_flags |= IOCB_NOWAIT;



	if (ctx->flags & IORING_SETUP_IOPOLL) {

		if (!(kiocb->ki_flags & IOCB_DIRECT) ||

		    !kiocb->ki_filp->f_op->iopoll)
@@ -3149,7 +3145,7 @@ static int io_read_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe, 
{

	ssize_t ret;



	ret = io_prep_rw(req, sqe, force_nonblock);

	ret = io_prep_rw(req, sqe);

	if (ret)

		return ret;
@@ -3284,6 +3280,9 @@ static int io_read(struct io_kiocb *req, bool force_nonblock, 
	/* Ensure we clear previously set non-block flag */

	if (!force_nonblock)

		kiocb->ki_flags &= ~IOCB_NOWAIT;

	else

		kiocb->ki_flags |= IOCB_NOWAIT;





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

	no_async = force_nonblock && !io_file_supports_async(req->file, READ);
@@ -3373,7 +3372,7 @@ static int io_write_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe, 
{

	ssize_t ret;



	ret = io_prep_rw(req, sqe, force_nonblock);

	ret = io_prep_rw(req, sqe);

	if (ret)

		return ret;
@@ -3408,7 +3407,9 @@ static int io_write(struct io_kiocb *req, bool force_nonblock, 


	/* Ensure we clear previously set non-block flag */

	if (!force_nonblock)

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

		kiocb->ki_flags &= ~IOCB_NOWAIT;

	else

		kiocb->ki_flags |= IOCB_NOWAIT;



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

	if (force_nonblock && !io_file_supports_async(req->file, WRITE))