Skip to content

Commit 715ca9d

Browse files
committed
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()
2 parents 531643f + ae6a888 commit 715ca9d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

io_uring/rw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ static int io_rw_init_file(struct io_kiocb *req, fmode_t mode, int rw_type)
807807
* reliably. If not, or it IOCB_NOWAIT is set, don't retry.
808808
*/
809809
if (kiocb->ki_flags & IOCB_NOWAIT ||
810-
((file->f_flags & O_NONBLOCK && (req->flags & REQ_F_SUPPORT_NOWAIT))))
810+
((file->f_flags & O_NONBLOCK && !(req->flags & REQ_F_SUPPORT_NOWAIT))))
811811
req->flags |= REQ_F_NOWAIT;
812812

813813
if (ctx->flags & IORING_SETUP_IOPOLL) {

0 commit comments

Comments
 (0)