aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Kent <raven@themaw.net>2009-12-15 19:45:46 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 10:19:58 -0500
commit90387c9c1d5787aeb7dfdfc90c8f8aeaeed7ad0e (patch)
tree79733f21cccb7ddb958d8638ebf199611660a9f1
parentaa952eb26d4344fdad44c104f3c298d3130c53da (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>
-rw-r--r--fs/autofs4/root.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 305136ba74b6..961ff377db03 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
514{ 514{
515 struct autofs_sb_info *sbi; 515 struct autofs_sb_info *sbi;
516 struct autofs_info *ino; 516 struct autofs_info *ino;
517 struct dentry *expiring, *unhashed; 517 struct dentry *expiring, *active;
518 int oz_mode; 518 int oz_mode;
519 519
520 DPRINTK("name = %.*s", 520 DPRINTK("name = %.*s",
@@ -530,9 +530,9 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s
530 DPRINTK("pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d", 530 DPRINTK("pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d",
531 current->pid, task_pgrp_nr(current), sbi->catatonic, oz_mode); 531 current->pid, task_pgrp_nr(current), sbi->catatonic, oz_mode);
532 532
533 unhashed = autofs4_lookup_active(sbi, dentry->d_parent, &dentry->d_name); 533 active = autofs4_lookup_active(sbi, dentry->d_parent, &dentry->d_name);
534 if (unhashed) { 534 if (active) {
535 dentry = unhashed; 535 dentry = active;
536 ino = autofs4_dentry_ino(dentry); 536 ino = autofs4_dentry_ino(dentry);
537 } else { 537 } else {
538 /* 538 /*
@@ -600,8 +600,8 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s
600 if (sigismember (sigset, SIGKILL) || 600 if (sigismember (sigset, SIGKILL) ||
601 sigismember (sigset, SIGQUIT) || 601 sigismember (sigset, SIGQUIT) ||
602 sigismember (sigset, SIGINT)) { 602 sigismember (sigset, SIGINT)) {
603 if (unhashed) 603 if (active)
604 dput(unhashed); 604 dput(active);
605 return ERR_PTR(-ERESTARTNOINTR); 605 return ERR_PTR(-ERESTARTNOINTR);
606 } 606 }
607 } 607 }
@@ -633,14 +633,14 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s
633 else 633 else
634 dentry = ERR_PTR(-ENOENT); 634 dentry = ERR_PTR(-ENOENT);
635 635
636 if (unhashed) 636 if (active)
637 dput(unhashed); 637 dput(active);
638 638
639 return dentry; 639 return dentry;
640 } 640 }
641 641
642 if (unhashed) 642 if (active)
643 return unhashed; 643 return active;
644 644
645 return NULL; 645 return NULL;
646} 646}