diff options
author | Ian Kent <raven@themaw.net> | 2009-01-06 17:42:07 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 18:59:23 -0500 |
commit | 41cfef2eb87694a8d64105c059b39f7bd6b7d4fe (patch) | |
tree | 413fa68364341d94366b2d36e537464db739ad5e | |
parent | 730c9eeca9808fc2cfb506cc68c90aa330da17b0 (diff) |
autofs4: fix var shadowed by local delaration
A local definition of devid in autofs_dev_ioctl_ismountpoint() shadows
the fuction wide definition.
Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/autofs4/dev-ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c index 054d6d9ad9ba..0566ff8db4cd 100644 --- a/fs/autofs4/dev-ioctl.c +++ b/fs/autofs4/dev-ioctl.c | |||
@@ -646,17 +646,17 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp, | |||
646 | magic = nd.path.dentry->d_inode->i_sb->s_magic; | 646 | magic = nd.path.dentry->d_inode->i_sb->s_magic; |
647 | } | 647 | } |
648 | } else { | 648 | } else { |
649 | dev_t devid = new_encode_dev(sbi->sb->s_dev); | 649 | dev_t dev = autofs4_get_dev(sbi); |
650 | 650 | ||
651 | err = path_lookup(path, LOOKUP_PARENT, &nd); | 651 | err = path_lookup(path, LOOKUP_PARENT, &nd); |
652 | if (err) | 652 | if (err) |
653 | goto out; | 653 | goto out; |
654 | 654 | ||
655 | err = autofs_dev_ioctl_find_super(&nd, devid); | 655 | err = autofs_dev_ioctl_find_super(&nd, dev); |
656 | if (err) | 656 | if (err) |
657 | goto out_release; | 657 | goto out_release; |
658 | 658 | ||
659 | devid = autofs4_get_dev(sbi); | 659 | devid = dev; |
660 | 660 | ||
661 | err = have_submounts(nd.path.dentry); | 661 | err = have_submounts(nd.path.dentry); |
662 | 662 | ||