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

block, bfq: cleanup bfq_bfqq_to_bfqg() 



Use bfq_group() instead, which do the same thing.

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/20220129015924.3958918-2-yukuai3@huawei.com


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

block/bfq-iosched.c

+2 −2
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq) 
	if (!bfqq->next_rq)

		return;



	bfqq->pos_root = &bfq_bfqq_to_bfqg(bfqq)->rq_pos_tree;

	bfqq->pos_root = &bfqq_group(bfqq)->rq_pos_tree;

	__bfqq = bfq_rq_pos_tree_lookup(bfqd, bfqq->pos_root,

			blk_rq_pos(bfqq->next_rq), &parent, &p);

	if (!__bfqq) {
@@ -2669,7 +2669,7 @@ static struct bfq_queue *bfqq_find_close(struct bfq_data *bfqd, 
					 struct bfq_queue *bfqq,

					 sector_t sector)

{

	struct rb_root *root = &bfq_bfqq_to_bfqg(bfqq)->rq_pos_tree;

	struct rb_root *root = &bfqq_group(bfqq)->rq_pos_tree;

	struct rb_node *parent, *node;

	struct bfq_queue *__bfqq;

block/bfq-iosched.h

+0 −1
Original line number Diff line number Diff line
@@ -1050,7 +1050,6 @@ extern struct blkcg_policy blkcg_policy_bfq; 
	for (parent = NULL; entity ; entity = parent)

#endif /* CONFIG_BFQ_GROUP_IOSCHED */



struct bfq_group *bfq_bfqq_to_bfqg(struct bfq_queue *bfqq);

struct bfq_queue *bfq_entity_to_bfqq(struct bfq_entity *entity);

unsigned int bfq_tot_busy_queues(struct bfq_data *bfqd);

struct bfq_service_tree *bfq_entity_service_tree(struct bfq_entity *entity);

block/bfq-wf2q.c

+0 −15
Original line number Diff line number Diff line
@@ -142,16 +142,6 @@ static bool bfq_update_next_in_service(struct bfq_sched_data *sd, 


#ifdef CONFIG_BFQ_GROUP_IOSCHED



struct bfq_group *bfq_bfqq_to_bfqg(struct bfq_queue *bfqq)

{

	struct bfq_entity *group_entity = bfqq->entity.parent;



	if (!group_entity)

		group_entity = &bfqq->bfqd->root_group->entity;



	return container_of(group_entity, struct bfq_group, entity);

}



/*

 * Returns true if this budget changes may let next_in_service->parent

 * become the next_in_service entity for its parent entity.
@@ -230,11 +220,6 @@ static bool bfq_no_longer_next_in_service(struct bfq_entity *entity) 


#else /* CONFIG_BFQ_GROUP_IOSCHED */



struct bfq_group *bfq_bfqq_to_bfqg(struct bfq_queue *bfqq)

{

	return bfqq->bfqd->root_group;

}



static bool bfq_update_parent_budget(struct bfq_entity *next_in_service)

{

	return false;