projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-6.5/block-late' into block-6.5
[platform/kernel/linux-starfive.git]
/
block
/
blk-wbt.c
diff --git
a/block/blk-wbt.c
b/block/blk-wbt.c
index
9f7c99c
..
0bb6131
100644
(file)
--- 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;
{
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) {
/* 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;
}
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 (!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);
wbt_init(disk);
}
EXPORT_SYMBOL_GPL(wbt_enable_default);