| Message ID | 20220514090522.1669270-6-yukuai3@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | multiple cleanup patches for bfq | expand |
On Sat 14-05-22 17:05:19, Yu Kuai wrote: > Just make the code a litter cleaner by removing the unnecessary > variable 'sd'. > > Signed-off-by: Yu Kuai <yukuai3@huawei.com> OK. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > block/bfq-wf2q.c | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) > > diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c > index 15b97687493a..da189c732376 100644 > --- a/block/bfq-wf2q.c > +++ b/block/bfq-wf2q.c > @@ -1085,12 +1085,12 @@ static void __bfq_requeue_entity(struct bfq_entity *entity) > } > > static void __bfq_activate_requeue_entity(struct bfq_entity *entity, > - struct bfq_sched_data *sd, > bool non_blocking_wait_rq) > { > struct bfq_service_tree *st = bfq_entity_service_tree(entity); > > - if (sd->in_service_entity == entity || entity->tree == &st->active) > + if (entity->sched_data->in_service_entity == entity || > + entity->tree == &st->active) > /* > * in service or already queued on the active tree, > * requeue or reposition > @@ -1122,14 +1122,10 @@ static void bfq_activate_requeue_entity(struct bfq_entity *entity, > bool non_blocking_wait_rq, > bool requeue, bool expiration) > { > - struct bfq_sched_data *sd; > - > for_each_entity(entity) { > - sd = entity->sched_data; > - __bfq_activate_requeue_entity(entity, sd, non_blocking_wait_rq); > - > - if (!bfq_update_next_in_service(sd, entity, expiration) && > - !requeue) > + __bfq_activate_requeue_entity(entity, non_blocking_wait_rq); > + if (!bfq_update_next_in_service(entity->sched_data, entity, > + expiration) && !requeue) > break; > } > } > -- > 2.31.1 >
diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c index 15b97687493a..da189c732376 100644 --- a/block/bfq-wf2q.c +++ b/block/bfq-wf2q.c @@ -1085,12 +1085,12 @@ static void __bfq_requeue_entity(struct bfq_entity *entity) } static void __bfq_activate_requeue_entity(struct bfq_entity *entity, - struct bfq_sched_data *sd, bool non_blocking_wait_rq) { struct bfq_service_tree *st = bfq_entity_service_tree(entity); - if (sd->in_service_entity == entity || entity->tree == &st->active) + if (entity->sched_data->in_service_entity == entity || + entity->tree == &st->active) /* * in service or already queued on the active tree, * requeue or reposition @@ -1122,14 +1122,10 @@ static void bfq_activate_requeue_entity(struct bfq_entity *entity, bool non_blocking_wait_rq, bool requeue, bool expiration) { - struct bfq_sched_data *sd; - for_each_entity(entity) { - sd = entity->sched_data; - __bfq_activate_requeue_entity(entity, sd, non_blocking_wait_rq); - - if (!bfq_update_next_in_service(sd, entity, expiration) && - !requeue) + __bfq_activate_requeue_entity(entity, non_blocking_wait_rq); + if (!bfq_update_next_in_service(entity->sched_data, entity, + expiration) && !requeue) break; } }
Just make the code a litter cleaner by removing the unnecessary variable 'sd'. Signed-off-by: Yu Kuai <yukuai3@huawei.com> --- block/bfq-wf2q.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)