Commit cb4b492a authored by Ian Kent's avatar Ian Kent Committed by Linus Torvalds

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: default avatarIan 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e4d5ade7
...@@ -474,23 +474,23 @@ static struct dentry *autofs4_lookup_expiring(struct dentry *dentry) ...@@ -474,23 +474,23 @@ static struct dentry *autofs4_lookup_expiring(struct dentry *dentry)
head = &sbi->expiring_list; head = &sbi->expiring_list;
list_for_each(p, head) { list_for_each(p, head) {
struct autofs_info *ino; struct autofs_info *ino;
struct dentry *dentry; struct dentry *expiring;
struct qstr *qstr; struct qstr *qstr;
ino = list_entry(p, struct autofs_info, expiring); 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 */ /* Bad luck, we've already been dentry_iput */
if (!dentry->d_inode) if (!expiring->d_inode)
goto next; goto next;
qstr = &dentry->d_name; qstr = &expiring->d_name;
if (dentry->d_name.hash != hash) if (expiring->d_name.hash != hash)
goto next; goto next;
if (dentry->d_parent != parent) if (expiring->d_parent != parent)
goto next; goto next;
if (qstr->len != len) if (qstr->len != len)
...@@ -498,15 +498,15 @@ static struct dentry *autofs4_lookup_expiring(struct dentry *dentry) ...@@ -498,15 +498,15 @@ static struct dentry *autofs4_lookup_expiring(struct dentry *dentry)
if (memcmp(qstr->name, str, len)) if (memcmp(qstr->name, str, len))
goto next; goto next;
if (d_unhashed(dentry)) { if (d_unhashed(expiring)) {
dget(dentry); dget(expiring);
spin_unlock(&dentry->d_lock); spin_unlock(&expiring->d_lock);
spin_unlock(&sbi->lookup_lock); spin_unlock(&sbi->lookup_lock);
spin_unlock(&dcache_lock); spin_unlock(&dcache_lock);
return dentry; return expiring;
} }
next: next:
spin_unlock(&dentry->d_lock); spin_unlock(&expiring->d_lock);
} }
spin_unlock(&sbi->lookup_lock); spin_unlock(&sbi->lookup_lock);
spin_unlock(&dcache_lock); spin_unlock(&dcache_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment