Revert "blk-throttle: Fix IO hang for a corner case"

This reverts commit 5b7048b89745c3c5fb4b3080fb7bced61dba2a2b.

The main purpose of this patch is cleanup.
The throtl_adjusted_limit function was removed after
commit bf20ab538c81 ("blk-throttle: remove
CONFIG_BLK_DEV_THROTTLING_LOW"), so the problem of not being
able to scale after setting bps or iops to 1 will not occur.
So revert this commit that bps/iops can be set to 1.

Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Xiuhong Wang <xiuhong.wang@unisoc.com>
Signed-off-by: Zhiguo Niu <zhiguo.niu@unisoc.com>
Acked-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Yu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20241016024508.3340330-1-xiuhong.wang@unisoc.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 2c4192e12efab67d40c2c0d246c0674c37f6e48a..443d1f47c2ce97da7e0d794acad6ac4fdffb1179 100644 (file)
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -1485,13 +1485,13 @@ static ssize_t tg_set_limit(struct kernfs_open_file *of,
                        goto out_finish;
 
                ret = -EINVAL;
-               if (!strcmp(tok, "rbps") && val > 1)
+               if (!strcmp(tok, "rbps"))
                        v[0] = val;
-               else if (!strcmp(tok, "wbps") && val > 1)
+               else if (!strcmp(tok, "wbps"))
                        v[1] = val;
-               else if (!strcmp(tok, "riops") && val > 1)
+               else if (!strcmp(tok, "riops"))
                        v[2] = min_t(u64, val, UINT_MAX);
-               else if (!strcmp(tok, "wiops") && val > 1)
+               else if (!strcmp(tok, "wiops"))
                        v[3] = min_t(u64, val, UINT_MAX);
                else
                        goto out_finish;