summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2020-08-27 03:58:26 +0300
committerJens Axboe <axboe@kernel.dk>2020-08-27 03:58:26 +0300
commit56450c20fe10d4d93f58019109aa4e06fc0b9206 (patch)
tree4fc098963f203c0bd0cfd04eb4f4454f7020d7c2
parent0fef948363f62494d779cf9dc3c0a86ea1e5f7cd (diff)
downloadlinux-56450c20fe10d4d93f58019109aa4e06fc0b9206.tar.xz
io_uring: clear req->result on IOPOLL re-issue
Make sure we clear req->result, which was set to -EAGAIN for retry purposes, when moving it to the reissue list. Otherwise we can end up retrying a request more than once, which leads to weird results in the io-wq handling (and other spots). Cc: stable@vger.kernel.org Reported-by: Andres Freund <andres@anarazel.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--fs/io_uring.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c
index bd2d8de3f2e8..6df08287c59e 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2049,6 +2049,7 @@ static void io_iopoll_complete(struct io_ring_ctx *ctx, unsigned int *nr_events,
req = list_first_entry(done, struct io_kiocb, inflight_entry);
if (READ_ONCE(req->result) == -EAGAIN) {
+ req->result = 0;
req->iopoll_completed = 0;
list_move_tail(&req->inflight_entry, &again);
continue;