Commit 41cfef2e authored by Ian Kent's avatar Ian Kent Committed by Linus Torvalds

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: default avatarIan Kent <raven@themaw.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 730c9eec
...@@ -646,17 +646,17 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp, ...@@ -646,17 +646,17 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp,
magic = nd.path.dentry->d_inode->i_sb->s_magic; magic = nd.path.dentry->d_inode->i_sb->s_magic;
} }
} else { } 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); err = path_lookup(path, LOOKUP_PARENT, &nd);
if (err) if (err)
goto out; goto out;
err = autofs_dev_ioctl_find_super(&nd, devid); err = autofs_dev_ioctl_find_super(&nd, dev);
if (err) if (err)
goto out_release; goto out_release;
devid = autofs4_get_dev(sbi); devid = dev;
err = have_submounts(nd.path.dentry); err = have_submounts(nd.path.dentry);
......
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