Commit 715ca9dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-6.12-20241019' of git://git.kernel.dk/linux 

Pull one more io_uring fix from Jens Axboe:
 "Fix for a regression introduced in 6.12-rc2, where a condition check
  was negated and hence -EAGAIN would bubble back up up to userspace
  rather than trigger a retry condition"

* tag 'io_uring-6.12-20241019' of git://git.kernel.dk/linux:
  io_uring/rw: fix wrong NOWAIT check in io_rw_init_file()
parents 531643fc ae6a888a

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) {