blk-throttle: remove last_bytes_disp and last_ios_disp

The two fields are not used any more, so remove them.

Cc: Tejun Heo <tj@kernel.org>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Acked-by: Tejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20250305043123.3938491-2-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index a52f0d6b40ad4ee4aeff589d538e424999ee05c1..213e7b04617a00b165a878c7716b953f456b159b 100644 (file)
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -819,13 +819,10 @@ static void throtl_charge_bio(struct throtl_grp *tg, struct bio *bio)
        unsigned int bio_size = throtl_bio_data_size(bio);
 
        /* Charge the bio to the group */
-       if (!bio_flagged(bio, BIO_BPS_THROTTLED)) {
+       if (!bio_flagged(bio, BIO_BPS_THROTTLED))
                tg->bytes_disp[rw] += bio_size;
-               tg->last_bytes_disp[rw] += bio_size;
-       }
 
        tg->io_disp[rw]++;
-       tg->last_io_disp[rw]++;
 }
 
 /**

diff --git a/block/blk-throttle.h b/block/blk-throttle.h
index 1a36d1278eea850a7e10067612a6108f03e10507..ba8f6e986994f1c83358675f20cf7c303beb7fdf 100644 (file)
--- a/block/blk-throttle.h
+++ b/block/blk-throttle.h
@@ -106,9 +106,6 @@ struct throtl_grp {
        /* Number of bio's dispatched in current slice */
        unsigned int io_disp[2];
 
-       uint64_t last_bytes_disp[2];
-       unsigned int last_io_disp[2];
-
        /*
         * The following two fields are updated when new configuration is
         * submitted while some bios are still throttled, they record how many