X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=block%2Fblk-wbt.c;h=0bb613139becbb5d783f1d2b84112f2e4b626477;hb=3a08284ff22080e742814dad1dbabb4b66349642;hp=9f7c99c025f34548522d1c601e0d59638f2f6b28;hpb=6d85ebf95c44e52337ca1d07f0db4b435d1e6762;p=platform%2Fkernel%2Flinux-starfive.git

diff --git a/block/blk-wbt.c b/block/blk-wbt.c
index 9f7c99c..0bb6131 100644
--- a/block/blk-wbt.c
+++ b/block/blk-wbt.c
@@ -713,14 +713,16 @@ void wbt_enable_default(struct gendisk *disk)
 {
 	struct request_queue *q = disk->queue;
 	struct rq_qos *rqos;
-	bool disable_flag = q->elevator &&
-		    test_bit(ELEVATOR_FLAG_DISABLE_WBT, &q->elevator->flags);
+	bool enable = IS_ENABLED(CONFIG_BLK_WBT_MQ);
+
+	if (q->elevator &&
+	    test_bit(ELEVATOR_FLAG_DISABLE_WBT, &q->elevator->flags))
+		enable = false;
 
 	/* Throttling already enabled? */
 	rqos = wbt_rq_qos(q);
 	if (rqos) {
-		if (!disable_flag &&
-		    RQWB(rqos)->enable_state == WBT_STATE_OFF_DEFAULT)
+		if (enable && RQWB(rqos)->enable_state == WBT_STATE_OFF_DEFAULT)
 			RQWB(rqos)->enable_state = WBT_STATE_ON_DEFAULT;
 		return;
 	}
@@ -729,7 +731,7 @@ void wbt_enable_default(struct gendisk *disk)
 	if (!blk_queue_registered(q))
 		return;
 
-	if (queue_is_mq(q) && !disable_flag)
+	if (queue_is_mq(q) && enable)
 		wbt_init(disk);
 }
 EXPORT_SYMBOL_GPL(wbt_enable_default);