ncpfs: fix sparse warnings in ioctl.c
PATCH 2/3 ncpfs: fix sparse warnings in ioctl.c
In both cases, these inode variables arebeing used to test the server's root inode against NULL. Change them to s_inode. fs/ncpfs/ioctl.c:391:18: warning: symbol 'inode' shadows an earlier one fs/ncpfs/ioctl.c:264:28: originally declared here fs/ncpfs/ioctl.c:441:17: warning: symbol 'inode' shadows an earlier one fs/ncpfs/ioctl.c:264:28: originally declared here
In this case, we are about to return anyway, just reuse result. fs/ncpfs/ioctl.c:521:8: warning: symbol 'result' shadows an earlier one fs/ncpfs/ioctl.c:268:6: originally declared here
Signed-off-by Harvey Harrison <[email protected]>
--- fs/ncpfs/ioctl.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-)
fs/ncpfs/ioctl.c +8 -9
@@ -388,11 +388,11 @@ int ncp_ioctl(struct inode *inode, struct file *filp,struct dentry * dentry = inode->i_sb->s_root;if (dentry) { -struct inode * inode = dentry->d_inode; +struct inode * s_inode = dentry->d_inode; -if (inode) { - sr.volNumber =NCP_FINFO (inode)->volNumber; - sr.dirEntNum =NCP_FINFO (inode)->dirEntNum; +if (s_inode) { + sr.volNumber =NCP_FINFO (s_inode)->volNumber; + sr.dirEntNum =NCP_FINFO (s_inode)->dirEntNum; sr.namespace = server->name_space[sr.volNumber]; }else DPRINTK ("ncpfs: s_root->d_inode==NULL\n" );
@@ -438,12 +438,12 @@ int ncp_ioctl(struct inode *inode, struct file *filp, dentry = inode->i_sb->s_root; server->root_setuped =1 ;if (dentry) { -struct inode * inode = dentry->d_inode; +struct inode * s_inode = dentry->d_inode;if (inode) { -NCP_FINFO (inode)->volNumber = vnum; -NCP_FINFO (inode)->dirEntNum = de; -NCP_FINFO (inode)->DosDirNum = dosde; +NCP_FINFO (s_inode)->volNumber = vnum; +NCP_FINFO (s_inode)->dirEntNum = de; +NCP_FINFO (s_inode)->DosDirNum = dosde; }else DPRINTK ("ncpfs: s_root->d_inode==NULL\n" ); }else
@@ -518,7 +518,6 @@ int ncp_ioctl(struct inode *inode, struct file *filp, } {struct ncp_lock_ioctl rqdata; -int result;if (copy_from_user (&rqdata, argp,sizeof (rqdata)))return -EFAULT ;
Signature · 1 line
1.5.4.1.1278.gc75be