From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754896Ab1FPBsT (ORCPT ); Wed, 15 Jun 2011 21:48:19 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:64424 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754557Ab1FPBrw (ORCPT ); Wed, 15 Jun 2011 21:47:52 -0400 From: Lai Jiangshan To: "Paul E. McKenney" , Steven Rostedt , Ingo Molnar , "Theodore Tso" , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Lai Jiangshan Subject: [PATCH 3/3] jbd2,rcu: simpify jbd2_dev_to_name() Date: Thu, 16 Jun 2011 09:47:06 +0800 Message-Id: <2aafd695ef8e4c263e98bdd123a9117dc4ef4a85.1308131437.git.laijs@cn.fujitsu.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: References: X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-06-16 09:47:21, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-06-16 09:47:28, Serialize complete at 2011-06-16 09:47:28 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Simpify jbd2_dev_to_name() and use xchg() to make the update side wait-free and remove the spinlock. Signed-off-by: Lai Jiangshan --- fs/jbd2/journal.c | 42 +++++++++++++++++++----------------------- 1 files changed, 19 insertions(+), 23 deletions(-) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index c37597a..7d5b6ac 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -2437,7 +2437,6 @@ struct devname_cache { }; #define CACHE_SIZE_BITS 6 static struct devname_cache __rcu *devcache[1 << CACHE_SIZE_BITS]; -static DEFINE_SPINLOCK(devname_cache_lock); void jbd2_dev_to_name(dev_t device, char *devname) { @@ -2445,6 +2444,7 @@ void jbd2_dev_to_name(dev_t device, char *devname) struct block_device *bd; static struct devname_cache *cache; + /* get the name from the cache */ rcu_read_lock(); cache = rcu_dereference(devcache[i]); if (cache && cache->device == device) { @@ -2454,32 +2454,28 @@ void jbd2_dev_to_name(dev_t device, char *devname) } rcu_read_unlock(); - cache = kmalloc(sizeof(struct devname_cache), GFP_KERNEL); - if (!cache) { + /* slowly get the name */ + bd = bdget(device); + if (bd) { + bdevname(bd, devname); + bdput(bd); + } else { __bdevname(device, devname); return; } - bd = bdget(device); - spin_lock(&devname_cache_lock); - if (devcache[i]) { - if (devcache[i]->device == device) { - kfree(cache); - bdput(bd); - memcpy(devname, devcache[i]->devname, BDEVNAME_SIZE); - spin_unlock(&devname_cache_lock); - return; - } - kfree_rcu(devcache[i], rcu); - } + + /* put the name to the cache */ + cache = kmalloc(sizeof(struct devname_cache), GFP_KERNEL); + if (!cache) + return; + + memcpy(cache->devname, devname, BDEVNAME_SIZE); cache->device = device; - if (bd) { - bdevname(bd, cache->devname); - bdput(bd); - } else - __bdevname(device, cache->devname); - rcu_assign_pointer(devcache[i], cache); - memcpy(devname, cache->devname, BDEVNAME_SIZE); - spin_unlock(&devname_cache_lock); + cache = xchg(&devcache[i], cache); + + /* free old cache by RCU */ + if (cache) + kfree_rcu(cache, rcu); } EXPORT_SYMBOL(jbd2_dev_to_name); -- 1.7.4.4