From: Ming Lei Date: Wed, 5 Mar 2025 04:31:19 +0000 (+0800) Subject: blk-throttle: remove last_bytes_disp and last_ios_disp X-Git-Tag: v6.15-rc1~166^2~43 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=483a393e7e6189aac7d47b5295029159ab7a1cf1;p=thirdparty%2Flinux.git blk-throttle: remove last_bytes_disp and last_ios_disp The two fields are not used any more, so remove them. Cc: Tejun Heo Cc: Josef Bacik Cc: Yu Kuai Signed-off-by: Ming Lei Acked-by: Tejun Heo Link: https://lore.kernel.org/r/20250305043123.3938491-2-ming.lei@redhat.com Signed-off-by: Jens Axboe --- diff --git a/block/blk-throttle.c b/block/blk-throttle.c index a52f0d6b40ad4..213e7b04617a0 100644 --- 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 1a36d1278eea8..ba8f6e986994f 100644 --- 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