This is a note to let you know that I've just added the patch titled
blk-wbt: remove unnecessary check in wbt_enable_default()
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
blk-wbt-remove-unnecessary-check-in-wbt_enable_defau.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 631dc45a1e1ca5721ec23d80d60381e818e3c409
Author: Yu Kuai <yukuai3@xxxxxxxxxx>
Date: Wed Oct 19 20:15:14 2022 +0800
blk-wbt: remove unnecessary check in wbt_enable_default()
[ Upstream commit b11d31ae01e6b0762b28e645ad6718a12faa8d14 ]
If CONFIG_BLK_WBT_MQ is disabled, wbt_init() won't do anything.
Signed-off-by: Yu Kuai <yukuai3@xxxxxxxxxx>
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Link: https://lore.kernel.org/r/20221019121518.3865235-3-yukuai1@xxxxxxxxxxxxxxx
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Stable-dep-of: f814bdda774c ("blk-wbt: Fix detection of dirty-throttled tasks")
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/block/blk-wbt.c b/block/blk-wbt.c
index c293e08b301ff..c5a8c10028a08 100644
--- a/block/blk-wbt.c
+++ b/block/blk-wbt.c
@@ -651,7 +651,7 @@ void wbt_enable_default(struct request_queue *q)
if (!blk_queue_registered(q))
return;
- if (queue_is_mq(q) && IS_ENABLED(CONFIG_BLK_WBT_MQ))
+ if (queue_is_mq(q))
wbt_init(q);
}
EXPORT_SYMBOL_GPL(wbt_enable_default);
