Commit 323745a3 authored by Kemeng Shi's avatar Kemeng Shi Committed by Jens Axboe
Browse files

block, bfq: remove unused bfq_wr_max_time in struct bfq_data 



bfqd->bfq_wr_max_time is set to 0 in bfq_init_queue and is never changed.
It is only used in bfq_wr_duration when bfq_wr_max_time > 0 which never
meets, so bfqd->bfq_wr_max_time is not used actually. Just remove it.

Signed-off-by: default avatarKemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230116095153.3810101-9-shikemeng@huaweicloud.com


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

block/bfq-iosched.c

+0 −4
Original line number Diff line number Diff line
@@ -1093,9 +1093,6 @@ static unsigned int bfq_wr_duration(struct bfq_data *bfqd) 
{

	u64 dur;



	if (bfqd->bfq_wr_max_time > 0)

		return bfqd->bfq_wr_max_time;



	dur = bfqd->rate_dur_prod;

	do_div(dur, bfqd->peak_rate);
@@ -7299,7 +7296,6 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e) 
	 */

	bfqd->bfq_wr_coeff = 30;

	bfqd->bfq_wr_rt_max_time = msecs_to_jiffies(300);

	bfqd->bfq_wr_max_time = 0;

	bfqd->bfq_wr_min_idle_time = msecs_to_jiffies(2000);

	bfqd->bfq_wr_min_inter_arr_async = msecs_to_jiffies(500);

	bfqd->bfq_wr_max_softrt_rate = 7000; /*

block/bfq-iosched.h

+0 −2
Original line number Diff line number Diff line
@@ -769,8 +769,6 @@ struct bfq_data { 
	 * is multiplied.

	 */

	unsigned int bfq_wr_coeff;

	/* maximum duration of a weight-raising period (jiffies) */

	unsigned int bfq_wr_max_time;



	/* Maximum weight-raising duration for soft real-time processes */

	unsigned int bfq_wr_rt_max_time;