io_uring: clean up io_poll_remove_waitqs()

Move some parts of io_poll_remove_waitqs() that are opcode independent.
Looks better and stresses that both do __io_poll_remove_one().

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/bbc717f82117cc335c89cbe67ec8d72608178732.1618278933.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 158ad55a6c14240c4ce1b88fb6519b3b37c1e539..1627d69a570c88beea04b80ebe10afd89298c40d 100644 (file)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -5219,21 +5219,16 @@ static bool io_poll_remove_waitqs(struct io_kiocb *req)
        bool do_complete;
 
        io_poll_remove_double(req);
+       do_complete = __io_poll_remove_one(req, io_poll_get_single(req), true);
 
-       if (req->opcode == IORING_OP_POLL_ADD) {
-               do_complete = __io_poll_remove_one(req, &req->poll, true);
-       } else {
+       if (req->opcode != IORING_OP_POLL_ADD && do_complete) {
                struct async_poll *apoll = req->apoll;
 
                /* non-poll requests have submit ref still */
-               do_complete = __io_poll_remove_one(req, &apoll->poll, true);
-               if (do_complete) {
-                       req_ref_put(req);
-                       kfree(apoll->double_poll);
-                       kfree(apoll);
-               }
+               req_ref_put(req);
+               kfree(apoll->double_poll);
+               kfree(apoll);
        }
-
        return do_complete;
 }