block/bfq: fix ifdef for CONFIG_BFQ_GROUP_IOSCHED=y

koct9i · axboe · commit 42b1bd33dcde · 2019-04-01T06:56:15.000-06:00
Replace BFQ_GROUP_IOSCHED_ENABLED with CONFIG_BFQ_GROUP_IOSCHED. Code under these ifdefs never worked, something might be broken. Fixes: 0471559 ("block, bfq: add/remove entity weights correctly") Fixes: 73d5811 ("block, bfq: consider also ioprio classes in symmetry detection") Reviewed-by: Holger Hoffstätte <holger@applied-asynchrony.com> Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru> Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
@@ -674,7 +674,7 @@ static bool bfq_symmetric_scenario(struct bfq_data *bfqd)
 	 * at least two nodes.
 	 */
 	return !(varied_queue_weights || multiple_classes_busy
-#ifdef BFQ_GROUP_IOSCHED_ENABLED
+#ifdef CONFIG_BFQ_GROUP_IOSCHED
 	       || bfqd->num_groups_with_pending_reqs > 0
 #endif
 		);
diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c
@@ -1012,7 +1012,7 @@ static void __bfq_activate_entity(struct bfq_entity *entity,
 		entity->on_st = true;
 	}
 
-#ifdef BFQ_GROUP_IOSCHED_ENABLED
+#ifdef CONFIG_BFQ_GROUP_IOSCHED
 	if (!bfq_entity_to_bfqq(entity)) { /* bfq_group */
 		struct bfq_group *bfqg =
 			container_of(entity, struct bfq_group, entity);

Original file line number	Diff line number	Diff line change
`@@ -1012,7 +1012,7 @@ static void __bfq_activate_entity(struct bfq_entity *entity,`
`1012`	`1012`	`entity->on_st = true;`
`1013`	`1013`	`}`
`1014`	`1014`
`1015`		`-#ifdef BFQ_GROUP_IOSCHED_ENABLED`
	`1015`	`+#ifdef CONFIG_BFQ_GROUP_IOSCHED`
`1016`	`1016`	`if (!bfq_entity_to_bfqq(entity)) { /* bfq_group */`
`1017`	`1017`	`struct bfq_group *bfqg =`
`1018`	`1018`	`container_of(entity, struct bfq_group, entity);`