summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorZhang Yi <yi.zhang@huawei.com>2021-06-19 17:37:00 +0800
committerJens Axboe <axboe@kernel.dk>2021-06-21 15:03:41 -0600
commit76a8040817b4b9c69b53f9b326987fa891b4082a (patch)
tree7115e42f86b974f0199f481ad0d7ba984b0216e2 /block
parent1d0903d61e9645c6330b94247b96dd873dfc11c8 (diff)
downloadlinux-76a8040817b4b9c69b53f9b326987fa891b4082a.tar.bz2
blk-wbt: make sure throttle is enabled properly
After commit a79050434b45 ("blk-rq-qos: refactor out common elements of blk-wbt"), if throttle was disabled by wbt_disable_default(), we could not enable again, fix this by set enable_state back to WBT_STATE_ON_DEFAULT. Fixes: a79050434b45 ("blk-rq-qos: refactor out common elements of blk-wbt") Signed-off-by: Zhang Yi <yi.zhang@huawei.com> Link: https://lore.kernel.org/r/20210619093700.920393-3-yi.zhang@huawei.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/blk-wbt.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/block/blk-wbt.c b/block/blk-wbt.c
index 0ce0883df3d6..3ed71b8da887 100644
--- a/block/blk-wbt.c
+++ b/block/blk-wbt.c
@@ -636,9 +636,13 @@ void wbt_set_write_cache(struct request_queue *q, bool write_cache_on)
void wbt_enable_default(struct request_queue *q)
{
struct rq_qos *rqos = wbt_rq_qos(q);
+
/* Throttling already enabled? */
- if (rqos)
+ if (rqos) {
+ if (RQWB(rqos)->enable_state == WBT_STATE_OFF_DEFAULT)
+ RQWB(rqos)->enable_state = WBT_STATE_ON_DEFAULT;
return;
+ }
/* Queue not registered? Maybe shutting down... */
if (!blk_queue_registered(q))