iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block, bfq: cleanup __bfq_weights_tree_remove()

Browse Source 
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>
This commit is contained in:
Yu Kuai 2022-09-16 15:19:42 +08:00 committed by Jens Axboe
parent afdba14612
commit eb5bca7365
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
block/bfq-iosched.c
View File

@ -944,7 +944,7 @@ inc_counter:
* See the comments to the function bfq_weights_tree_add() for considerations * See the comments to the function bfq_weights_tree_add() for considerations
* about overhead. * 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; struct rb_root_cached *root;
@ -964,15 +964,6 @@ reset_entity_pointer:
bfq_put_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. * Return expired entry, or NULL to just start from scratch in rbtree.
*/ */

1
block/bfq-iosched.h
View File

@ -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); 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_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_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_weights_tree_remove(struct bfq_queue *bfqq);
void bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq, void bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq,
bool compensate, enum bfqq_expiration reason); bool compensate, enum bfqq_expiration reason);

2
block/bfq-wf2q.c
View File

@ -770,7 +770,7 @@ __bfq_entity_update_weight_prio(struct bfq_service_tree *old_st,
* there is a counter associated with the entity). * there is a counter associated with the entity).
*/ */
if (prev_weight != new_weight && bfqq) if (prev_weight != new_weight && bfqq)
__bfq_weights_tree_remove(bfqq); bfq_weights_tree_remove(bfqq);
entity->weight = new_weight; entity->weight = new_weight;
/* /*
* Add the entity, if it is not a weight-raised queue, * Add the entity, if it is not a weight-raised queue,