From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 15 Apr 2021 17:31:14 +0000 (-0600)
Subject: io_uring: fix merge error for async resubmit
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a7be7c23cfdd2cb57609fd2d607923a9cb2a305d;p=linux.git

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: 8c130827f417 ("io_uring: don't alter iopoll reissue fail ret code")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 10b2367138be2..55892e0227dd7 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -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 {