| Message ID | 20221222191641.1643117-10-shikemeng@huaweicloud.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | A few bugfix and cleancode patch for bfq | expand |
On Fri 23-12-22 03:16:40, Kemeng Shi wrote: > 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: Kemeng Shi <shikemeng@huaweicloud.com> Nice catch. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > block/bfq-iosched.c | 4 ---- > block/bfq-iosched.h | 2 -- > 2 files changed, 6 deletions(-) > > diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c > index 195cdc6be087..91bc68fba72d 100644 > --- a/block/bfq-iosched.c > +++ b/block/bfq-iosched.c > @@ -1068,9 +1068,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); > > @@ -7079,7 +7076,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; /* > diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h > index 9fa89577322d..0b1a5438046a 100644 > --- a/block/bfq-iosched.h > +++ b/block/bfq-iosched.h > @@ -719,8 +719,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; > -- > 2.30.0 >
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 195cdc6be087..91bc68fba72d 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1068,9 +1068,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); @@ -7079,7 +7076,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; /* diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 9fa89577322d..0b1a5438046a 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -719,8 +719,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;
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: Kemeng Shi <shikemeng@huaweicloud.com> --- block/bfq-iosched.c | 4 ---- block/bfq-iosched.h | 2 -- 2 files changed, 6 deletions(-)