diff --git a/fs/io_uring.c b/fs/io_uring.c
index 80db5898e1192009736d34624e447383ae0517f5..12f686283aded12ae3deec848d4260ff806ddd00 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);