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

io_uring/rw: fix wrong NOWAIT check in io_rw_init_file() 



A previous commit improved how !FMODE_NOWAIT is dealt with, but
inadvertently negated a check whilst doing so. This caused -EAGAIN to be
returned from reading files with O_NONBLOCK set. Fix up the check for
REQ_F_SUPPORT_NOWAIT.

Reported-by: default avatarJulian Orth <ju.orth@gmail.com>
Link: https://github.com/axboe/liburing/issues/1270


Fixes: f7c91343 ("io_uring/rw: allow pollable non-blocking attempts for !FMODE_NOWAIT")
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8f7033aa

io_uring/rw.c

+1 −1
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ static int io_rw_init_file(struct io_kiocb *req, fmode_t mode, int rw_type) 
	 * reliably. If not, or it IOCB_NOWAIT is set, don't retry.

	 */

	if (kiocb->ki_flags & IOCB_NOWAIT ||

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

	    ((file->f_flags & O_NONBLOCK && !(req->flags & REQ_F_SUPPORT_NOWAIT))))

		req->flags |= REQ_F_NOWAIT;



	if (ctx->flags & IORING_SETUP_IOPOLL) {