lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

autofs4: renamer unhashed to active in autofs4_lookup()

Browse Source 
Rename the variable unhashed to active in autofs4_lookup() to better
reflect its usage.

Signed-off-by: Ian Kent <raven@themaw.net>
Cc: Sage Weil <sage@newdream.net>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Andreas Dilger <adilger@sun.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Yehuda Saheh <yehuda@newdream.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ian Kent
2009-12-15 16:45:46 -08:00
committed by Linus Torvalds
parent aa952eb26d
commit 90387c9c1d
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fs/autofs4/root.c
View File

@@ -514,7 +514,7 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s
{ {
struct autofs_sb_info *sbi; struct autofs_sb_info *sbi;
struct autofs_info *ino; struct autofs_info *ino;
struct dentry *expiring, *unhashed; struct dentry *expiring, *active;
int oz_mode; int oz_mode;
DPRINTK("name = %.*s", 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", DPRINTK("pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d",
current->pid, task_pgrp_nr(current), sbi->catatonic, oz_mode); current->pid, task_pgrp_nr(current), sbi->catatonic, oz_mode);
unhashed = autofs4_lookup_active(sbi, dentry->d_parent, &dentry->d_name); active = autofs4_lookup_active(sbi, dentry->d_parent, &dentry->d_name);
if (unhashed) { if (active) {
dentry = unhashed; dentry = active;
ino = autofs4_dentry_ino(dentry); ino = autofs4_dentry_ino(dentry);
} else { } else {
/* /*
@@ -600,8 +600,8 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s
if (sigismember (sigset, SIGKILL) || if (sigismember (sigset, SIGKILL) ||
sigismember (sigset, SIGQUIT) || sigismember (sigset, SIGQUIT) ||
sigismember (sigset, SIGINT)) { sigismember (sigset, SIGINT)) {
if (unhashed) if (active)
dput(unhashed); dput(active);
return ERR_PTR(-ERESTARTNOINTR); return ERR_PTR(-ERESTARTNOINTR);
} }
} }
@@ -633,14 +633,14 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s
else else
dentry = ERR_PTR(-ENOENT); dentry = ERR_PTR(-ENOENT);
if (unhashed) if (active)
dput(unhashed); dput(active);
return dentry; return dentry;
} }
if (unhashed) if (active)
return unhashed; return active;
return NULL; return NULL;
} }