From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755438AbZJABBu (ORCPT ); Wed, 30 Sep 2009 21:01:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755332AbZJABBs (ORCPT ); Wed, 30 Sep 2009 21:01:48 -0400 Received: from outbound.icp-qv1-irony-out1.iinet.net.au ([203.59.1.106]:9782 "EHLO outbound.icp-qv1-irony-out1.iinet.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755418AbZJABBr (ORCPT ); Wed, 30 Sep 2009 21:01:47 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApoEAGecw0rLO7dJ/2dsb2JhbADXZoQnBIFNVg X-IronPort-AV: E=Sophos;i="4.44,483,1249228800"; d="scan'208";a="585680405" From: Ian Kent Subject: [PATCH 08/10] autofs4 - rename dentry to active in autofs4_lookup_active() To: Andrew Morton Cc: Kernel Mailing List , autofs mailing list , linux-fsdevel , Sage Weil , Al Viro , Andreas Dilger , Christoph Hellwig , Yehuda Saheh Date: Thu, 01 Oct 2009 09:01:48 +0800 Message-ID: <20091001010148.7675.92564.stgit@zeus.themaw.net> In-Reply-To: <20091001010054.7675.77673.stgit@zeus.themaw.net> References: <20091001010054.7675.77673.stgit@zeus.themaw.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In autofs4_lookup_active() a declaration within the list traversal loop uses a declaration that has the same name as the function parameter. Signed-off-by: Ian Kent --- fs/autofs4/root.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index b6530f3..e8a8881 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c @@ -419,23 +419,23 @@ static struct dentry *autofs4_lookup_active(struct dentry *dentry) head = &sbi->active_list; list_for_each(p, head) { struct autofs_info *ino; - struct dentry *dentry; + struct dentry *active; struct qstr *qstr; ino = list_entry(p, struct autofs_info, active); - dentry = ino->dentry; + active = ino->dentry; - spin_lock(&dentry->d_lock); + spin_lock(&active->d_lock); /* Already gone? */ - if (atomic_read(&dentry->d_count) == 0) + if (atomic_read(&active->d_count) == 0) goto next; - qstr = &dentry->d_name; + qstr = &active->d_name; - if (dentry->d_name.hash != hash) + if (active->d_name.hash != hash) goto next; - if (dentry->d_parent != parent) + if (active->d_parent != parent) goto next; if (qstr->len != len) @@ -443,15 +443,15 @@ static struct dentry *autofs4_lookup_active(struct dentry *dentry) if (memcmp(qstr->name, str, len)) goto next; - if (d_unhashed(dentry)) { - dget(dentry); - spin_unlock(&dentry->d_lock); + if (d_unhashed(active)) { + dget(active); + spin_unlock(&active->d_lock); spin_unlock(&sbi->lookup_lock); spin_unlock(&dcache_lock); - return dentry; + return active; } next: - spin_unlock(&dentry->d_lock); + spin_unlock(&active->d_lock); } spin_unlock(&sbi->lookup_lock); spin_unlock(&dcache_lock);