From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 23 Feb 2021 15:58:04 +0000 (-0700)
Subject: io_uring: abstract out helper for removing poll waitqs/hashes
X-Git-Tag: for-5.13/io_uring-2021-04-27~107
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b2c3f7e1715605c045f46fb369d850ada4749388;p=linux-block.git

io_uring: abstract out helper for removing poll waitqs/hashes

No functional changes in this patch, just preparation for kill multishot
poll on CQ overflow.

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

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 80db5898e119..12f686283ade 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -5216,7 +5216,7 @@ static bool __io_poll_remove_one(struct io_kiocb *req,
 	return do_complete;
 }
 
-static bool io_poll_remove_one(struct io_kiocb *req)
+static bool io_poll_remove_waitqs(struct io_kiocb *req)
 {
 	bool do_complete;
 
@@ -5236,6 +5236,14 @@ static bool io_poll_remove_one(struct io_kiocb *req)
 		}
 	}
 
+	return do_complete;
+}
+
+static bool io_poll_remove_one(struct io_kiocb *req)
+{
+	bool do_complete;
+
+	do_complete = io_poll_remove_waitqs(req);
 	if (do_complete) {
 		io_cqring_fill_event(req, -ECANCELED);
 		io_commit_cqring(req->ctx);