diff options
| author | Yu Kuai <yukuai3@huawei.com> | 2024-09-03 21:51:48 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-09-10 16:31:41 -0600 |
| commit | 3bf73e6283ef0bae4e27dad62309e50e3bf7ee88 (patch) | |
| tree | dbdb7a65c4e0830ed590b9b58bc7cf84aed2f9c4 | |
| parent | a5e61b50c9f44c5edb6e134ede6fee8806ffafa9 (diff) | |
blk-throttle: remove last_low_overflow_time
last_low_overflow_time is not used anymore after commit bf20ab538c81
("blk-throttle: remove CONFIG_BLK_DEV_THROTTLING_LOW").
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Acked-by: Tejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20240903135149.271857-2-yukuai1@huaweicloud.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | block/blk-throttle.c | 8 | ||||
| -rw-r--r-- | block/blk-throttle.h | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/block/blk-throttle.c b/block/blk-throttle.c index dc6140fa3de0..eb859c44c9f3 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -1611,17 +1611,13 @@ bool __blk_throtl_bio(struct bio *bio) sq = &tg->service_queue; while (true) { - if (tg->last_low_overflow_time[rw] == 0) - tg->last_low_overflow_time[rw] = jiffies; /* throtl is FIFO - if bios are already queued, should queue */ if (sq->nr_queued[rw]) break; /* if above limits, break to queue */ - if (!tg_may_dispatch(tg, bio, NULL)) { - tg->last_low_overflow_time[rw] = jiffies; + if (!tg_may_dispatch(tg, bio, NULL)) break; - } /* within limits, let's charge and dispatch directly */ throtl_charge_bio(tg, bio); @@ -1661,8 +1657,6 @@ bool __blk_throtl_bio(struct bio *bio) tg->io_disp[rw], tg_iops_limit(tg, rw), sq->nr_queued[READ], sq->nr_queued[WRITE]); - tg->last_low_overflow_time[rw] = jiffies; - td->nr_queued[rw]++; throtl_add_bio_tg(bio, qn, tg); throttled = true; diff --git a/block/blk-throttle.h b/block/blk-throttle.h index 4d9ef5abdf21..1a36d1278eea 100644 --- a/block/blk-throttle.h +++ b/block/blk-throttle.h @@ -106,8 +106,6 @@ struct throtl_grp { /* Number of bio's dispatched in current slice */ unsigned int io_disp[2]; - unsigned long last_low_overflow_time[2]; - uint64_t last_bytes_disp[2]; unsigned int last_io_disp[2]; |