--- x/io_uring/poll.h
+++ y/io_uring/poll.h
@@ -28,6 +28,7 @@ int io_poll_add(struct io_kiocb *req, un
 
 int io_poll_remove_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
 int io_poll_remove(struct io_kiocb *req, unsigned int issue_flags);
+void io_poll_cleanup(struct io_kiocb *);
 
 struct io_cancel_data;
 int io_poll_cancel(struct io_ring_ctx *ctx, struct io_cancel_data *cd,
--- x/io_uring/poll.c
+++ y/io_uring/poll.c
@@ -820,6 +820,11 @@ static struct io_kiocb *io_poll_file_fin
 	return NULL;
 }
 
+void io_poll_cleanup(struct io_kiocb *req)
+{
+	io_poll_remove_entries(req);
+}
+
 static int io_poll_disarm(struct io_kiocb *req)
 {
 	if (!req)
--- x/io_uring/io_uring.c
+++ y/io_uring/io_uring.c
@@ -2734,6 +2734,7 @@ static void io_req_caches_free(struct io
 	while (!io_req_cache_empty(ctx)) {
 		struct io_kiocb *req = io_alloc_req(ctx);
 
+		io_poll_cleanup(req);
 		kmem_cache_free(req_cachep, req);
 		nr++;
 	}