Skip to content

Commit

Permalink
autofs4: renamer unhashed to active in autofs4_lookup()
Browse files Browse the repository at this point in the history
Rename the variable unhashed to active in autofs4_lookup() to better
reflect its usage.

Signed-off-by: Ian Kent <[email protected]>
Cc: Sage Weil <[email protected]>
Cc: Al Viro <[email protected]>
Cc: Andreas Dilger <[email protected]>
Cc: Christoph Hellwig <[email protected]>
Cc: Yehuda Saheh <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
raven-au authored and torvalds committed Dec 16, 2009
1 parent aa952eb commit 90387c9
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions fs/autofs4/root.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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 {
/*
Expand Down Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 90387c9

Please sign in to comment.