From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Kent Subject: [PATCH] autofs4 - fix var shadowed by local delaration Date: Mon, 27 Oct 2008 13:36:36 +0900 Message-ID: <20081027043636.15523.95519.stgit@zeus.themaw.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: Kernel Mailing List , autofs mailing list , linux-fsdevel To: Andrew Morton Return-path: Received: from outbound.icp-qv1-irony-out4.iinet.net.au ([203.59.1.150]:17042 "EHLO outbound.icp-qv1-irony-out4.iinet.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750728AbYJ0Egl (ORCPT ); Mon, 27 Oct 2008 00:36:41 -0400 Sender: linux-fsdevel-owner@vger.kernel.org List-ID: A local definition of devid in autofs_dev_ioctl_ismountpoint() shadows the fuction wide definition. Signed-off-by: Ian Kent --- 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 a040639..e19d584 100644 --- a/fs/autofs4/dev-ioctl.c +++ b/fs/autofs4/dev-ioctl.c @@ -597,17 +597,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);