The rcu callback cfq_cfqd_free() just calls a kfree(), so we use kfree_rcu() instead of the call_rcu(cfq_cfqd_free). Signed-off-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx> --- block/cfq-iosched.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index ea83a4f..32fe43e 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -3812,11 +3812,6 @@ static void cfq_put_async_queues(struct cfq_data *cfqd) cfq_put_queue(cfqd->async_idle_cfqq); } -static void cfq_cfqd_free(struct rcu_head *head) -{ - kfree(container_of(head, struct cfq_data, rcu)); -} - static void cfq_exit_queue(struct elevator_queue *e) { struct cfq_data *cfqd = e->elevator_data; @@ -3850,7 +3845,7 @@ static void cfq_exit_queue(struct elevator_queue *e) spin_unlock(&cic_index_lock); /* Wait for cfqg->blkg->key accessors to exit their grace periods. */ - call_rcu(&cfqd->rcu, cfq_cfqd_free); + kfree_rcu(cfqd, rcu); } static int cfq_alloc_cic_index(void) -- 1.7.4 _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/containers