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)
commita7be7c23cfdd2cb57609fd2d607923a9cb2a305d
tree7793dfe80fe47811b6eb2778821de91159eee926
parent75652a30ff67539999148859da071ede862090ca
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>
fs/io_uring.c