From: Ian Kent <raven@themaw.net>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Kernel Mailing List <linux-kernel@vger.kernel.org>,
autofs mailing list <autofs@linux.kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>,
Sage Weil <sage@newdream.net>, Al Viro <viro@ZenIV.linux.org.uk>,
Andreas Dilger <adilger@sun.com>,
Christoph Hellwig <hch@infradead.org>,
Yehuda Saheh <yehuda@newdream.net>
Subject: [PATCH 05/10] autofs4 - renamer unhashed to active in autofs4_lookup()
Date: Thu, 01 Oct 2009 09:01:28 +0800 [thread overview]
Message-ID: <20091001010128.7675.52509.stgit@zeus.themaw.net> (raw)
In-Reply-To: <20091001010054.7675.77673.stgit@zeus.themaw.net>
Rename the variable unhashed to active in autofs4_lookup() to
better reflect its usage.
Signed-off-by: Ian Kent <raven@themaw.net>
---
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;
}
next prev parent reply other threads:[~2009-10-01 1:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-01 1:00 [PATCH 01/10] autofs4 - use macros for active list handling Ian Kent
2009-10-01 1:01 ` [PATCH 02/10] autofs4 - use macros for expiring list Ian Kent
2009-10-01 1:01 ` [PATCH 03/10] autofs4 - use macro for need mount check Ian Kent
2009-10-01 1:01 ` [PATCH 04/10] autofs4 - use autofs_info for pending flag Ian Kent
2009-10-01 1:01 ` Ian Kent [this message]
2009-10-01 1:01 ` [PATCH 06/10] autofs4 - cleanup active and expire lookup Ian Kent
2009-10-01 1:01 ` [PATCH 07/10] autofs4 - eliminate d_unhashed in path walk checks Ian Kent
2009-10-01 1:01 ` [PATCH 08/10] autofs4 - rename dentry to active in autofs4_lookup_active() Ian Kent
2009-10-01 1:01 ` [PATCH 09/10] autofs4 - rename dentry to expiring in autofs4_lookup_expiring() Ian Kent
2009-10-01 1:02 ` [PATCH 10/10] autofs4 - always use lookup for lookup Ian Kent
2009-10-06 20:49 ` [PATCH 01/10] autofs4 - use macros for active list handling Andrew Morton
2009-10-07 3:50 ` Ian Kent
2009-10-07 3:50 ` Ian Kent
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091001010128.7675.52509.stgit@zeus.themaw.net \
--to=raven@themaw.net \
--cc=adilger@sun.com \
--cc=akpm@linux-foundation.org \
--cc=autofs@linux.kernel.org \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sage@newdream.net \
--cc=viro@ZenIV.linux.org.uk \
--cc=yehuda@newdream.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.