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

block, bfq: cleanup bfq_activate_requeue_entity() 



Just make the code a litter cleaner by removing the unnecessary
variable 'sd'.

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-4-yukuai1@huaweicloud.com


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

block/bfq-wf2q.c

+5 −9
Original line number Diff line number Diff line
@@ -1052,12 +1052,12 @@ static void __bfq_requeue_entity(struct bfq_entity *entity) 
}



static void __bfq_activate_requeue_entity(struct bfq_entity *entity,

					  struct bfq_sched_data *sd,

					  bool non_blocking_wait_rq)

{

	struct bfq_service_tree *st = bfq_entity_service_tree(entity);



	if (sd->in_service_entity == entity || entity->tree == &st->active)

	if (entity->sched_data->in_service_entity == entity ||

	    entity->tree == &st->active)

		 /*

		  * in service or already queued on the active tree,

		  * requeue or reposition
@@ -1089,14 +1089,10 @@ static void bfq_activate_requeue_entity(struct bfq_entity *entity, 
					bool non_blocking_wait_rq,

					bool requeue, bool expiration)

{

	struct bfq_sched_data *sd;



	for_each_entity(entity) {

		sd = entity->sched_data;

		__bfq_activate_requeue_entity(entity, sd, non_blocking_wait_rq);



		if (!bfq_update_next_in_service(sd, entity, expiration) &&

		    !requeue)

		__bfq_activate_requeue_entity(entity, non_blocking_wait_rq);

		if (!bfq_update_next_in_service(entity->sched_data, entity,

						expiration) && !requeue)

			break;

	}

}