Commit eb5bca73 authored by Yu Kuai's avatar Yu Kuai Committed by Jens Axboe
Browse files

block, bfq: cleanup __bfq_weights_tree_remove() 



It's the same with bfq_weights_tree_remove() now.

Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Acked-by: default avatarPaolo Valente <paolo.valente@linaro.org>
Link: https://lore.kernel.org/r/20220916071942.214222-7-yukuai1@huaweicloud.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent afdba146

block/bfq-iosched.c

+1 −10
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ void bfq_weights_tree_add(struct bfq_queue *bfqq) 
 * 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 @@ void __bfq_weights_tree_remove(struct bfq_queue *bfqq) 
	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.

 */

block/bfq-iosched.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

block/bfq-wf2q.c

+1 −1
Original line number Diff line number Diff line
@@ -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,