kevin/linux
1
Fork 0
Code

blk-throttle: remove last_low_overflow_time

Browse Source 
last_low_overflow_time is not used anymore after commit bf20ab538c
("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>
This commit is contained in:
Yu Kuai 2024-09-03 21:51:48 +08:00 committed by Jens Axboe
parent a5e61b50c9
commit 3bf73e6283
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/blk-throttle.c
View File

@ -1611,17 +1611,13 @@ bool __blk_throtl_bio(struct bio *bio)
sq = &tg->service_queue; sq = &tg->service_queue;
while (true) { 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 */ /* throtl is FIFO - if bios are already queued, should queue */
if (sq->nr_queued[rw]) if (sq->nr_queued[rw])
break; break;
/* if above limits, break to queue */ /* if above limits, break to queue */
if (!tg_may_dispatch(tg, bio, NULL)) { if (!tg_may_dispatch(tg, bio, NULL))
tg->last_low_overflow_time[rw] = jiffies;
break; break;
}
/* within limits, let's charge and dispatch directly */ /* within limits, let's charge and dispatch directly */
throtl_charge_bio(tg, bio); 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), tg->io_disp[rw], tg_iops_limit(tg, rw),
sq->nr_queued[READ], sq->nr_queued[WRITE]); sq->nr_queued[READ], sq->nr_queued[WRITE]);
tg->last_low_overflow_time[rw] = jiffies;
td->nr_queued[rw]++; td->nr_queued[rw]++;
throtl_add_bio_tg(bio, qn, tg); throtl_add_bio_tg(bio, qn, tg);
throttled = true; throttled = true;

2
block/blk-throttle.h
View File

@ -106,8 +106,6 @@ struct throtl_grp {
/* Number of bio's dispatched in current slice */ /* Number of bio's dispatched in current slice */
unsigned int io_disp[2]; unsigned int io_disp[2];
unsigned long last_low_overflow_time[2];
uint64_t last_bytes_disp[2]; uint64_t last_bytes_disp[2];
unsigned int last_io_disp[2]; unsigned int last_io_disp[2];