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

block, bfq: don't declare 'bfqd' as type 'void *' in bfq_group 



Prevent unnecessary format conversion for bfqg->bfqd in multiple
places.

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


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

block/bfq-cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ void bfqg_stats_update_io_add(struct bfq_group *bfqg, struct bfq_queue *bfqq, 
{

	blkg_rwstat_add(&bfqg->stats.queued, opf, 1);

	bfqg_stats_end_empty_time(&bfqg->stats);

	if (!(bfqq == ((struct bfq_data *)bfqg->bfqd)->in_service_queue))

	if (!(bfqq == bfqg->bfqd->in_service_queue))

		bfqg_stats_set_start_group_wait_time(bfqg, bfqq_group(bfqq));

}

block/bfq-iosched.h

+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ struct bfq_group { 
	struct bfq_entity entity;

	struct bfq_sched_data sched_data;



	void *bfqd;

	struct bfq_data *bfqd;



	struct bfq_queue *async_bfqq[2][IOPRIO_NR_LEVELS];

	struct bfq_queue *async_idle_bfqq;

block/bfq-wf2q.c

+2 −4
Original line number Diff line number Diff line
@@ -222,9 +222,8 @@ static void bfq_inc_active_entities(struct bfq_entity *entity) 
{

	struct bfq_sched_data *sd = entity->sched_data;

	struct bfq_group *bfqg = container_of(sd, struct bfq_group, sched_data);

	struct bfq_data *bfqd = (struct bfq_data *)bfqg->bfqd;



	if (bfqg != bfqd->root_group)

	if (bfqg != bfqg->bfqd->root_group)

		bfqg->active_entities++;

}
@@ -232,9 +231,8 @@ static void bfq_dec_active_entities(struct bfq_entity *entity) 
{

	struct bfq_sched_data *sd = entity->sched_data;

	struct bfq_group *bfqg = container_of(sd, struct bfq_group, sched_data);

	struct bfq_data *bfqd = (struct bfq_data *)bfqg->bfqd;



	if (bfqg != bfqd->root_group)

	if (bfqg != bfqg->bfqd->root_group)

		bfqg->active_entities--;

}