From b2c3f7e1715605c045f46fb369d850ada4749388 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 23 Feb 2021 08:58:04 -0700 Subject: [PATCH] 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 --- fs/io_uring.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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); -- GitLab