Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Ian Kent and committed by
Linus Torvalds
41cfef2e 730c9eec

+3 -3
+3 -3
fs/autofs4/dev-ioctl.c
··· 646 646 magic = nd.path.dentry->d_inode->i_sb->s_magic; 647 647 } 648 648 } else { 649 - dev_t devid = new_encode_dev(sbi->sb->s_dev); 649 + dev_t dev = autofs4_get_dev(sbi); 650 650 651 651 err = path_lookup(path, LOOKUP_PARENT, &nd); 652 652 if (err) 653 653 goto out; 654 654 655 - err = autofs_dev_ioctl_find_super(&nd, devid); 655 + err = autofs_dev_ioctl_find_super(&nd, dev); 656 656 if (err) 657 657 goto out_release; 658 658 659 - devid = autofs4_get_dev(sbi); 659 + devid = dev; 660 660 661 661 err = have_submounts(nd.path.dentry); 662 662