Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-31 23:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

autofs4: rename dentry to active in autofs4_lookup_active()

Browse Source 
In autofs4_lookup_active() a declaration within the list traversal loop
uses a declaration that has the same name as the function parameter.

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:49 -08:00 committed by Linus Torvalds
parent c42c7f7e69
commit e4d5ade7b5
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fs/autofs4/root.c
View File

@ -419,23 +419,23 @@ static struct dentry *autofs4_lookup_active(struct dentry *dentry)
head = &sbi->active_list;
list_for_each(p, head) {
struct autofs_info *ino;
struct dentry *dentry;
struct dentry *active;
struct qstr *qstr;
ino = list_entry(p, struct autofs_info, active);
dentry = ino->dentry;
active = ino->dentry;
spin_lock(&dentry->d_lock);
spin_lock(&active->d_lock);
/* Already gone? */
if (atomic_read(&dentry->d_count) == 0)
if (atomic_read(&active->d_count) == 0)
goto next;
qstr = &dentry->d_name;
qstr = &active->d_name;
if (dentry->d_name.hash != hash)
if (active->d_name.hash != hash)
goto next;
if (dentry->d_parent != parent)
if (active->d_parent != parent)
goto next;
if (qstr->len != len)
@ -443,15 +443,15 @@ static struct dentry *autofs4_lookup_active(struct dentry *dentry)
if (memcmp(qstr->name, str, len))
goto next;
if (d_unhashed(dentry)) {
dget(dentry);
spin_unlock(&dentry->d_lock);
if (d_unhashed(active)) {
dget(active);
spin_unlock(&active->d_lock);
spin_unlock(&sbi->lookup_lock);
spin_unlock(&dcache_lock);
return dentry;
return active;
}
next:
spin_unlock(&dentry->d_lock);
spin_unlock(&active->d_lock);
}
spin_unlock(&sbi->lookup_lock);
spin_unlock(&dcache_lock);