]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
block/blk-throttle: drop unneeded blk_stat_enable_accounting
authorGuenter Roeck <linux@roeck-us.net>
Fri, 14 Nov 2025 23:54:33 +0000 (15:54 -0800)
committerJens Axboe <axboe@kernel.dk>
Mon, 17 Nov 2025 16:39:48 +0000 (09:39 -0700)
After the removal of CONFIG_BLK_DEV_THROTTLING_LOW, it is no longer
necessary to enable block accounting, so remove the call to
blk_stat_enable_accounting(). With that, the track_bio_latency variable
is no longer used and can be deleted from struct throtl_data. Also,
including blk-stat.h is no longer necessary.

Fixes: bf20ab538c81 ("blk-throttle: remove CONFIG_BLK_DEV_THROTTLING_LOW")
Cc: Yu Kuai <yukuai@kernel.org>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Khazhismel Kumykov <khazhy@google.com>
Reviewed-by: Yu Kuai <yukuai@fnnas.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-throttle.c

index c19d052a8f2f1246120df435f3f0b1df31b124ec..041bcf7b2c7ca9f39068acda8083e1265f884ad4 100644 (file)
@@ -12,7 +12,6 @@
 #include <linux/blktrace_api.h>
 #include "blk.h"
 #include "blk-cgroup-rwstat.h"
-#include "blk-stat.h"
 #include "blk-throttle.h"
 
 /* Max dispatch from a group in 1 round */
@@ -43,8 +42,6 @@ struct throtl_data
 
        /* Work for dispatching throttled bios */
        struct work_struct dispatch_work;
-
-       bool track_bio_latency;
 };
 
 static void throtl_pending_timer_fn(struct timer_list *t);
@@ -1340,9 +1337,6 @@ static int blk_throtl_init(struct gendisk *disk)
        }
 
        td->throtl_slice = DFL_THROTL_SLICE;
-       td->track_bio_latency = !queue_is_mq(q);
-       if (!td->track_bio_latency)
-               blk_stat_enable_accounting(q);
 
 out:
        blk_mq_unquiesce_queue(disk->queue);