diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-03-08 20:09:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-03-08 20:09:27 +0100 |
| commit | 14296d0e85d45695ad2dc65b653b29e5a3514cdb (patch) | |
| tree | c5d875755a94e8fa9d671d0cdd6f1e4755318698 /io_uring/rw.c | |
| parent | 6914f7e2e25fac9d1d2b62c208eaa5f2bf810fe9 (diff) | |
| parent | 21e4543a2e2f8538373d1d19264c4bae6f13e798 (diff) | |
Merge branch 'linus' into x86/urgent, to pick up dependent patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'io_uring/rw.c')
| -rw-r--r-- | io_uring/rw.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/io_uring/rw.c b/io_uring/rw.c index 9edc6baebd01..e5528cebcd06 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -560,11 +560,10 @@ static void io_complete_rw_iopoll(struct kiocb *kiocb, long res) if (kiocb->ki_flags & IOCB_WRITE) io_req_end_write(req); if (unlikely(res != req->cqe.res)) { - if (res == -EAGAIN && io_rw_should_reissue(req)) { + if (res == -EAGAIN && io_rw_should_reissue(req)) req->flags |= REQ_F_REISSUE | REQ_F_BL_NO_RECYCLE; - return; - } - req->cqe.res = res; + else + req->cqe.res = res; } /* order with io_iopoll_complete() checking ->iopoll_completed */ |