From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 20 Feb 2020 16:59:02 +0000 (-0700)
Subject: io_uring: io_accept() should hold on to submit reference on retry
X-Git-Tag: v5.7-rc1~201^2~52
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e441d1cf20e1b9fc443e6130488d41e1941aae82;p=users%2Fwilly%2Flinux.git

io_uring: io_accept() should hold on to submit reference on retry

Don't drop an early reference, hang on to it and let the caller drop
it. This makes it behave more like "regular" requests.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 64b4519aabf8..2bf954a42586 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -3354,6 +3354,8 @@ static void io_accept_finish(struct io_wq_work **workptr)
 	struct io_kiocb *req = container_of(*workptr, struct io_kiocb, work);
 	struct io_kiocb *nxt = NULL;
 
+	io_put_req(req);
+
 	if (io_req_cancelled(req))
 		return;
 	__io_accept(req, &nxt, false);
@@ -3371,7 +3373,6 @@ static int io_accept(struct io_kiocb *req, struct io_kiocb **nxt,
 	ret = __io_accept(req, nxt, force_nonblock);
 	if (ret == -EAGAIN && force_nonblock) {
 		req->work.func = io_accept_finish;
-		io_put_req(req);
 		return -EAGAIN;
 	}
 	return 0;