io_uring: revert "io_uring: fix multishot poll on overflow"

This is no longer needed after commit aa1df3a360a0 ("io_uring: fix CQE
reordering"), since all reordering is now taken care of.

This reverts commit a2da676376fe ("io_uring: fix multishot poll on
overflow").

Signed-off-by: Dylan Yudaken <dylany@meta.com>
Link: https://lore.kernel.org/r/20221107125236.260132-3-dylany@meta.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/poll.c b/io_uring/poll.c
index 589b60fc740ac75f9288a9b9b396bd9a63508c2e..e1b8652b670f2e57264520fde9120524da106126 100644 (file)
--- a/io_uring/poll.c
+++ b/io_uring/poll.c
@@ -244,10 +244,8 @@ static int io_poll_check_events(struct io_kiocb *req, bool *locked)
                                                    req->apoll_events);
 
                        if (!io_post_aux_cqe(ctx, req->cqe.user_data,
-                                            mask, IORING_CQE_F_MORE, false)) {
-                               io_req_set_res(req, mask, 0);
-                               return IOU_POLL_REMOVE_POLL_USE_RES;
-                       }
+                                            mask, IORING_CQE_F_MORE, true))
+                               return -ECANCELED;
                } else {
                        ret = io_poll_issue(req, locked);
                        if (ret == IOU_STOP_MULTISHOT)