diff options
| author | Ian Kent <raven@themaw.net> | 2009-12-15 16:45:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 07:19:58 -0800 |
| commit | 90387c9c1d5787aeb7dfdfc90c8f8aeaeed7ad0e (patch) | |
| tree | 79733f21cccb7ddb958d8638ebf199611660a9f1 /fs | |
| parent | aa952eb26d4344fdad44c104f3c298d3130c53da (diff) | |
autofs4: renamer unhashed to active in autofs4_lookup()
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | 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 305136ba74b..961ff377db0 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; } |