io_uring: fix merge error for async resubmit
authorJens Axboe <axboe@kernel.dk>
Thu, 15 Apr 2021 17:31:14 +0000 (11:31 -0600)
committerJens Axboe <axboe@kernel.dk>
Fri, 16 Apr 2021 15:47:08 +0000 (09:47 -0600)
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>
fs/io_uring.c

index 10b2367138be24b6918edade203c1cbdfa0ce4ad..55892e0227dd7634fe5b46db6489942292ee2000 100644 (file)
@@ -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 {