Commit a7be7c23 authored Apr 15, 2021 by Jens Axboe

io_uring: fix merge error for async resubmit

A hand-edit while applying this patch on top of a new base resulted in
a reverted check for re-issue, resulting in spurious -EAGAIN errors.

Fixes: 8c130827 ("io_uring: don't alter iopoll reissue fail ret code")
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 75652a30

fs/io_uring.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2738,7 +2738,7 @@ static void kiocb_done(struct kiocb *kiocb, ssize_t ret,

		if (check_reissue && req->flags & REQ_F_REISSUE) {
		req->flags &= ~REQ_F_REISSUE;
		if (!io_resubmit_prep(req)) {
		if (io_resubmit_prep(req)) {
		req_ref_get(req);
		io_queue_async_work(req);
		} else {