block, bfq: cleanup __bfq_weights_tree_remove()

It's the same with bfq_weights_tree_remove() now.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Acked-by: Paolo Valente <paolo.valente@linaro.org>
Link: https://lore.kernel.org/r/20220916071942.214222-7-yukuai1@huaweicloud.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 11703f92c7fbc334d5cfe9be25a2f35b37627974..42aa5fc7f17b4c5478b5c70b36cac7256b5f49bd 100644 (file)
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -944,7 +944,7 @@ inc_counter:
  * See the comments to the function bfq_weights_tree_add() for considerations
  * about overhead.
  */
-void __bfq_weights_tree_remove(struct bfq_queue *bfqq)
+void bfq_weights_tree_remove(struct bfq_queue *bfqq)
 {
        struct rb_root_cached *root;
 
@@ -964,15 +964,6 @@ reset_entity_pointer:
        bfq_put_queue(bfqq);
 }
 
-/*
- * Invoke __bfq_weights_tree_remove on bfqq and decrement the number
- * of active groups for each queue's inactive parent entity.
- */
-void bfq_weights_tree_remove(struct bfq_queue *bfqq)
-{
-       __bfq_weights_tree_remove(bfqq);
-}
-
 /*
  * Return expired entry, or NULL to just start from scratch in rbtree.
  */

diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h
index f56147e125013e28ff6fefc1a46b08b51bded39f..76363841d8ff8c56ff8f6ed80d2e1290d8304191 100644 (file)
--- a/block/bfq-iosched.h
+++ b/block/bfq-iosched.h
@@ -970,7 +970,6 @@ void bic_set_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq, bool is_sync);
 struct bfq_data *bic_to_bfqd(struct bfq_io_cq *bic);
 void bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq);
 void bfq_weights_tree_add(struct bfq_queue *bfqq);
-void __bfq_weights_tree_remove(struct bfq_queue *bfqq);
 void bfq_weights_tree_remove(struct bfq_queue *bfqq);
 void bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq,
                     bool compensate, enum bfqq_expiration reason);

diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c
index 124aaea6196e0c8c29444f7cdc7b53414e5a1186..5a02cb94d86e98b666b93b798a9c4c58f7b26532 100644 (file)
--- a/block/bfq-wf2q.c
+++ b/block/bfq-wf2q.c
@@ -770,7 +770,7 @@ __bfq_entity_update_weight_prio(struct bfq_service_tree *old_st,
                 * there is a counter associated with the entity).
                 */
                if (prev_weight != new_weight && bfqq)
-                       __bfq_weights_tree_remove(bfqq);
+                       bfq_weights_tree_remove(bfqq);
                entity->weight = new_weight;
                /*
                 * Add the entity, if it is not a weight-raised queue,