From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755399AbZJABBc (ORCPT ); Wed, 30 Sep 2009 21:01:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755384AbZJABBa (ORCPT ); Wed, 30 Sep 2009 21:01:30 -0400 Received: from outbound.icp-qv1-irony-out3.iinet.net.au ([203.59.1.148]:17560 "EHLO outbound.icp-qv1-irony-out3.iinet.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755378AbZJABB2 (ORCPT ); Wed, 30 Sep 2009 21:01:28 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApoEALObw0rLO7dJ/2dsb2JhbADXZYQnBIFNVg X-IronPort-AV: E=Sophos;i="4.44,483,1249228800"; d="scan'208";a="508086658" From: Ian Kent Subject: [PATCH 05/10] autofs4 - renamer unhashed to active in autofs4_lookup() 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:28 +0800 Message-ID: <20091001010128.7675.52509.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 Rename the variable unhashed to active in autofs4_lookup() to better reflect its usage. Signed-off-by: Ian Kent --- fs/autofs4/root.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index 305136b..961ff37 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c @@ -514,7 +514,7 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s { struct autofs_sb_info *sbi; struct autofs_info *ino; - struct dentry *expiring, *unhashed; + struct dentry *expiring, *active; int oz_mode; DPRINTK("name = %.*s", @@ -530,9 +530,9 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s DPRINTK("pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d", current->pid, task_pgrp_nr(current), sbi->catatonic, oz_mode); - unhashed = autofs4_lookup_active(sbi, dentry->d_parent, &dentry->d_name); - if (unhashed) { - dentry = unhashed; + active = autofs4_lookup_active(sbi, dentry->d_parent, &dentry->d_name); + if (active) { + dentry = active; ino = autofs4_dentry_ino(dentry); } else { /* @@ -600,8 +600,8 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s if (sigismember (sigset, SIGKILL) || sigismember (sigset, SIGQUIT) || sigismember (sigset, SIGINT)) { - if (unhashed) - dput(unhashed); + if (active) + dput(active); return ERR_PTR(-ERESTARTNOINTR); } } @@ -633,14 +633,14 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s else dentry = ERR_PTR(-ENOENT); - if (unhashed) - dput(unhashed); + if (active) + dput(active); return dentry; } - if (unhashed) - return unhashed; + if (active) + return active; return NULL; }