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 <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
index 054d6d9ad9baa0d883b26db48e4eebad990d734f..0566ff8db4cd711f9b84b151dd95b23e82c19519 100644 (file)
--- 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,
                        magic = nd.path.dentry->d_inode->i_sb->s_magic;
                }
        } else {
-               dev_t devid = new_encode_dev(sbi->sb->s_dev);
+               dev_t dev = autofs4_get_dev(sbi);
 
                err = path_lookup(path, LOOKUP_PARENT, &nd);
                if (err)
                        goto out;
 
-               err = autofs_dev_ioctl_find_super(&nd, devid);
+               err = autofs_dev_ioctl_find_super(&nd, dev);
                if (err)
                        goto out_release;
 
-               devid = autofs4_get_dev(sbi);
+               devid = dev;
 
                err = have_submounts(nd.path.dentry);