From patchwork Wed Jun 8 19:29:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 1859 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.47.109) by localhost6.localdomain6 with IMAP4-SSL; 14 Jun 2011 16:46:06 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.10 with SMTP id ds10cs200027vdc; Wed, 8 Jun 2011 12:31:03 -0700 (PDT) Received: by 10.101.166.1 with SMTP id t1mr6712370ano.43.1307561430186; Wed, 08 Jun 2011 12:30:30 -0700 (PDT) Received: from e8.ny.us.ibm.com (e8.ny.us.ibm.com [32.97.182.138]) by mx.google.com with ESMTPS id p3si2156875anl.62.2011.06.08.12.30.29 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 08 Jun 2011 12:30:30 -0700 (PDT) Received-SPF: pass (google.com: domain of paulmck@linux.vnet.ibm.com designates 32.97.182.138 as permitted sender) client-ip=32.97.182.138; Authentication-Results: mx.google.com; spf=pass (google.com: domain of paulmck@linux.vnet.ibm.com designates 32.97.182.138 as permitted sender) smtp.mail=paulmck@linux.vnet.ibm.com Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by e8.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p58JJK9V013436 for ; Wed, 8 Jun 2011 15:19:20 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p58JUNLv1359972 for ; Wed, 8 Jun 2011 15:30:23 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p58JUEwX015751 for ; Wed, 8 Jun 2011 15:30:21 -0400 Received: from paulmck-ThinkPad-W500 (paulmck-ThinkPad-W500.beaverton.ibm.com [9.47.24.65]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p58JUB9R015583; Wed, 8 Jun 2011 15:30:11 -0400 Received: by paulmck-ThinkPad-W500 (Postfix, from userid 1000) id C036C13F7DB; Wed, 8 Jun 2011 12:30:09 -0700 (PDT) From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org Cc: mingo@elte.hu, laijs@cn.fujitsu.com, dipankar@in.ibm.com, akpm@linux-foundation.org, mathieu.desnoyers@polymtl.ca, josh@joshtriplett.org, niv@us.ibm.com, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, Valdis.Kletnieks@vt.edu, dhowells@redhat.com, eric.dumazet@gmail.com, darren@dvhart.com, patches@linaro.org, "Paul E. McKenney" , Jens Axboe Subject: [PATCH tip/core/rcu 12/28] block, rcu: Convert call_rcu(cfq_cfqd_free) to kfree_rcu() Date: Wed, 8 Jun 2011 12:29:51 -0700 Message-Id: <1307561407-13809-12-git-send-email-paulmck@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <20110608192943.GA13211@linux.vnet.ibm.com> References: <20110608192943.GA13211@linux.vnet.ibm.com> From: Lai Jiangshan 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 Signed-off-by: Paul E. McKenney Cc: Jens Axboe Reviewed-by: Josh Triplett --- 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 5b52011..6f2a460 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -3816,11 +3816,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; @@ -3854,7 +3849,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)