Commit 732312e1 authored by Xiuhong Wang's avatar Xiuhong Wang Committed by Jens Axboe
Browse files

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



This reverts commit 5b7048b8.

The main purpose of this patch is cleanup.
The throtl_adjusted_limit function was removed after
commit bf20ab53 ("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: default avatarXiuhong Wang <xiuhong.wang@unisoc.com>
Signed-off-by: default avatarZhiguo Niu <zhiguo.niu@unisoc.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20241016024508.3340330-1-xiuhong.wang@unisoc.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 28878733

block/blk-throttle.c

+4 −4
Original line number Diff line number Diff line
@@ -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;