Skip to content

Commit

Permalink
io_uring: fix merge error for async resubmit
Browse files Browse the repository at this point in the history
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: 8c13082 ("io_uring: don't alter iopoll reissue fail ret code")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Jens Axboe committed Apr 16, 2021
1 parent 75652a3 commit a7be7c2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/io_uring.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit a7be7c2

Please sign in to comment.