Skip to content

Commit 3bf73e6

Browse files
YuKuai-huaweiaxboe
authored andcommitted
blk-throttle: remove last_low_overflow_time
last_low_overflow_time is not used anymore after commit bf20ab5 ("blk-throttle: remove CONFIG_BLK_DEV_THROTTLING_LOW"). Signed-off-by: Yu Kuai <[email protected]> Acked-by: Tejun Heo <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent a5e61b5 commit 3bf73e6

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

block/blk-throttle.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1611,17 +1611,13 @@ bool __blk_throtl_bio(struct bio *bio)
16111611
sq = &tg->service_queue;
16121612

16131613
while (true) {
1614-
if (tg->last_low_overflow_time[rw] == 0)
1615-
tg->last_low_overflow_time[rw] = jiffies;
16161614
/* throtl is FIFO - if bios are already queued, should queue */
16171615
if (sq->nr_queued[rw])
16181616
break;
16191617

16201618
/* if above limits, break to queue */
1621-
if (!tg_may_dispatch(tg, bio, NULL)) {
1622-
tg->last_low_overflow_time[rw] = jiffies;
1619+
if (!tg_may_dispatch(tg, bio, NULL))
16231620
break;
1624-
}
16251621

16261622
/* within limits, let's charge and dispatch directly */
16271623
throtl_charge_bio(tg, bio);
@@ -1661,8 +1657,6 @@ bool __blk_throtl_bio(struct bio *bio)
16611657
tg->io_disp[rw], tg_iops_limit(tg, rw),
16621658
sq->nr_queued[READ], sq->nr_queued[WRITE]);
16631659

1664-
tg->last_low_overflow_time[rw] = jiffies;
1665-
16661660
td->nr_queued[rw]++;
16671661
throtl_add_bio_tg(bio, qn, tg);
16681662
throttled = true;

block/blk-throttle.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ struct throtl_grp {
106106
/* Number of bio's dispatched in current slice */
107107
unsigned int io_disp[2];
108108

109-
unsigned long last_low_overflow_time[2];
110-
111109
uint64_t last_bytes_disp[2];
112110
unsigned int last_io_disp[2];
113111

0 commit comments

Comments
 (0)