autofs4: rename dentry to expiring in autofs4_lookup_expiring()
In autofs4_lookup_expiring() 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:
parent
e4d5ade7b5
commit
cb4b492ac7
|
@ -474,23 +474,23 @@ static struct dentry *autofs4_lookup_expiring(struct dentry *dentry)
|
|||
head = &sbi->expiring_list;
|
||||
list_for_each(p, head) {
|
||||
struct autofs_info *ino;
|
||||
struct dentry *dentry;
|
||||
struct dentry *expiring;
|
||||
struct qstr *qstr;
|
||||
|
||||
ino = list_entry(p, struct autofs_info, expiring);
|
||||
dentry = ino->dentry;
|
||||
expiring = ino->dentry;
|
||||
|
||||
spin_lock(&dentry->d_lock);
|
||||
spin_lock(&expiring->d_lock);
|
||||
|
||||
/* Bad luck, we've already been dentry_iput */
|
||||
if (!dentry->d_inode)
|
||||
if (!expiring->d_inode)
|
||||
goto next;
|
||||
|
||||
qstr = &dentry->d_name;
|
||||
qstr = &expiring->d_name;
|
||||
|
||||
if (dentry->d_name.hash != hash)
|
||||
if (expiring->d_name.hash != hash)
|
||||
goto next;
|
||||
if (dentry->d_parent != parent)
|
||||
if (expiring->d_parent != parent)
|
||||
goto next;
|
||||
|
||||
if (qstr->len != len)
|
||||
|
@ -498,15 +498,15 @@ static struct dentry *autofs4_lookup_expiring(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(expiring)) {
|
||||
dget(expiring);
|
||||
spin_unlock(&expiring->d_lock);
|
||||
spin_unlock(&sbi->lookup_lock);
|
||||
spin_unlock(&dcache_lock);
|
||||
return dentry;
|
||||
return expiring;
|
||||
}
|
||||
next:
|
||||
spin_unlock(&dentry->d_lock);
|
||||
spin_unlock(&expiring->d_lock);
|
||||
}
|
||||
spin_unlock(&sbi->lookup_lock);
|
||||
spin_unlock(&dcache_lock);
|
||||
|
|
Loading…
Reference in New Issue