Skip to content

Commit d53276d

Browse files
committed
Merge tag 'io_uring-6.14-20250306' of git://git.kernel.dk/linux
Pull io_uring fix from Jens Axboe: "A single fix for a regression introduced in the 6.14 merge window, causing stalls/hangs with IOPOLL reads or writes" * tag 'io_uring-6.14-20250306' of git://git.kernel.dk/linux: io_uring/rw: ensure reissue path is correctly handled for IOPOLL
2 parents 1c5183a + bcb0fda commit d53276d

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

io_uring/rw.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -560,11 +560,10 @@ static void io_complete_rw_iopoll(struct kiocb *kiocb, long res)
560560
if (kiocb->ki_flags & IOCB_WRITE)
561561
io_req_end_write(req);
562562
if (unlikely(res != req->cqe.res)) {
563-
if (res == -EAGAIN && io_rw_should_reissue(req)) {
563+
if (res == -EAGAIN && io_rw_should_reissue(req))
564564
req->flags |= REQ_F_REISSUE | REQ_F_BL_NO_RECYCLE;
565-
return;
566-
}
567-
req->cqe.res = res;
565+
else
566+
req->cqe.res = res;
568567
}
569568

570569
/* order with io_iopoll_complete() checking ->iopoll_completed */

0 commit comments

Comments
 (0)