]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
blk-throttle: remove last_low_overflow_time
authorYu Kuai <yukuai3@huawei.com>
Tue, 3 Sep 2024 13:51:48 +0000 (21:51 +0800)
committerJens Axboe <axboe@kernel.dk>
Tue, 10 Sep 2024 22:31:41 +0000 (16:31 -0600)
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>
block/blk-throttle.c
block/blk-throttle.h

index dc6140fa3de06173d141c5de40825917f0dee16a..eb859c44c9f337ce23f3cc148903b5a02eed8840 100644 (file)
@@ -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;
index 4d9ef5abdf21cc05f69022b6f42ce4f2275148a7..1a36d1278eea850a7e10067612a6108f03e10507 100644 (file)
@@ -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];