aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorIan Kent <raven@themaw.net>2009-12-15 19:45:50 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 10:19:58 -0500
commitcb4b492ac7595aad10756fe0b04691f0965e0cfc (patch)
treee0737776e152e83c9d449086b631a975f165bcc7 /fs
parente4d5ade7b54cf74efcf53ff3dcb09454c29d70cf (diff)
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/autofs4/root.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index e8a8881c3f45..a015b49891df 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -474,23 +474,23 @@ static struct dentry *autofs4_lookup_expiring(struct dentry *dentry)
474 head = &sbi->expiring_list; 474 head = &sbi->expiring_list;
475 list_for_each(p, head) { 475 list_for_each(p, head) {
476 struct autofs_info *ino; 476 struct autofs_info *ino;
477 struct dentry *dentry; 477 struct dentry *expiring;
478 struct qstr *qstr; 478 struct qstr *qstr;
479 479
480 ino = list_entry(p, struct autofs_info, expiring); 480 ino = list_entry(p, struct autofs_info, expiring);
481 dentry = ino->dentry; 481 expiring = ino->dentry;
482 482
483 spin_lock(&dentry->d_lock); 483 spin_lock(&expiring->d_lock);
484 484
485 /* Bad luck, we've already been dentry_iput */ 485 /* Bad luck, we've already been dentry_iput */
486 if (!dentry->d_inode) 486 if (!expiring->d_inode)
487 goto next; 487 goto next;
488 488
489 qstr = &dentry->d_name; 489 qstr = &expiring->d_name;
490 490
491 if (dentry->d_name.hash != hash) 491 if (expiring->d_name.hash != hash)
492 goto next; 492 goto next;
493 if (dentry->d_parent != parent) 493 if (expiring->d_parent != parent)
494 goto next; 494 goto next;
495 495
496 if (qstr->len != len) 496 if (qstr->len != len)
@@ -498,15 +498,15 @@ static struct dentry *autofs4_lookup_expiring(struct dentry *dentry)
498 if (memcmp(qstr->name, str, len)) 498 if (memcmp(qstr->name, str, len))
499 goto next; 499 goto next;
500 500
501 if (d_unhashed(dentry)) { 501 if (d_unhashed(expiring)) {
502 dget(dentry); 502 dget(expiring);
503 spin_unlock(&dentry->d_lock); 503 spin_unlock(&expiring->d_lock);
504 spin_unlock(&sbi->lookup_lock); 504 spin_unlock(&sbi->lookup_lock);
505 spin_unlock(&dcache_lock); 505 spin_unlock(&dcache_lock);
506 return dentry; 506 return expiring;
507 } 507 }
508next: 508next:
509 spin_unlock(&dentry->d_lock); 509 spin_unlock(&expiring->d_lock);
510 } 510 }
511 spin_unlock(&sbi->lookup_lock); 511 spin_unlock(&sbi->lookup_lock);
512 spin_unlock(&dcache_lock); 512 spin_unlock(&dcache_lock);