From patchwork Wed Jun 8 19:29:57 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: 1858 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:05 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.10 with SMTP id ds10cs199934vdc; Wed, 8 Jun 2011 12:30:27 -0700 (PDT) Received: by 10.101.139.9 with SMTP id r9mr3616190ann.144.1307561426812; Wed, 08 Jun 2011 12:30:26 -0700 (PDT) Received: from e6.ny.us.ibm.com (e6.ny.us.ibm.com [32.97.182.146]) by mx.google.com with ESMTPS id u1si2142573anh.145.2011.06.08.12.30.26 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 08 Jun 2011 12:30:26 -0700 (PDT) Received-SPF: pass (google.com: domain of paulmck@linux.vnet.ibm.com designates 32.97.182.146 as permitted sender) client-ip=32.97.182.146; Authentication-Results: mx.google.com; spf=pass (google.com: domain of paulmck@linux.vnet.ibm.com designates 32.97.182.146 as permitted sender) smtp.mail=paulmck@linux.vnet.ibm.com Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by e6.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p58J6GZw008346 for ; Wed, 8 Jun 2011 15:06:16 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p58JUOqR131782 for ; Wed, 8 Jun 2011 15:30:24 -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 p58JUGmi016128 for ; Wed, 8 Jun 2011 15:30:24 -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 p58JUB28015586; Wed, 8 Jun 2011 15:30:15 -0400 Received: by paulmck-ThinkPad-W500 (Postfix, from userid 1000) id E145913F800; 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" , Jan Kara Subject: [PATCH tip/core/rcu 18/28] jbd2, rcu: Convert call_rcu(free_devcache) to kfree_rcu() Date: Wed, 8 Jun 2011 12:29:57 -0700 Message-Id: <1307561407-13809-18-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 free_devcache() just calls a kfree(), so we use kfree_rcu() instead of the call_rcu(free_devcache). Signed-off-by: Lai Jiangshan Signed-off-by: Paul E. McKenney Cc: Andrew Morton Cc: Jan Kara Reviewed-by: Josh Triplett --- fs/jbd2/journal.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index e0ec3db..13fb464 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -2390,11 +2390,6 @@ struct devname_cache { static struct devname_cache *devcache[1 << CACHE_SIZE_BITS]; static DEFINE_SPINLOCK(devname_cache_lock); -static void free_devcache(struct rcu_head *rcu) -{ - kfree(rcu); -} - const char *jbd2_dev_to_name(dev_t device) { int i = hash_32(device, CACHE_SIZE_BITS); @@ -2423,7 +2418,7 @@ const char *jbd2_dev_to_name(dev_t device) spin_unlock(&devname_cache_lock); return ret; } - call_rcu(&devcache[i]->rcu, free_devcache); + kfree_rcu(devcache[i], rcu); } devcache[i] = new_dev; devcache[i]->device = device;