Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

3 files changed, 9 insertions, 16 deletions

diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
index fbbb9f7afa1a..2e5ab1204dec 100644
--- a/fs/ncpfs/inode.c
+++ b/fs/ncpfs/inode.c
@@ -107,12 +107,6 @@ static const struct super_operations ncp_sops =
         .show_options   = ncp_show_options,
 };
 
-extern struct dentry_operations ncp_root_dentry_operations;
-#if defined(CONFIG_NCPFS_EXTRAS) || defined(CONFIG_NCPFS_NFS_NS)
-extern const struct address_space_operations ncp_symlink_aops;
-extern int ncp_symlink(struct inode*, struct dentry*, const char*);
-#endif
-
 /*
  * Fill in the ncpfs-specific information in the inode.
  */
diff --git a/fs/ncpfs/ioctl.c b/fs/ncpfs/ioctl.c
index ad8f167e54bc..3a97c95e1ca2 100644
--- a/fs/ncpfs/ioctl.c
+++ b/fs/ncpfs/ioctl.c
@@ -389,11 +389,11 @@ static 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");
@@ -439,12 +439,12 @@ static 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
@@ -519,7 +519,6 @@ static 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;
diff --git a/fs/ncpfs/ncpsign_kernel.c b/fs/ncpfs/ncpsign_kernel.c
index 749a18d33599..7c0b5c21e6cf 100644
--- a/fs/ncpfs/ncpsign_kernel.c
+++ b/fs/ncpfs/ncpsign_kernel.c
@@ -55,7 +55,7 @@ static void nwsign(char *r_data1, char *r_data2, char *outdata) {
  unsigned int w0,w1,w2,w3;
  static int rbit[4]={0, 2, 1, 3};
 #ifdef __i386__
- unsigned int *data2=(int *)r_data2;
+ unsigned int *data2=(unsigned int *)r_data2;
 #else
  unsigned int data2[16];
  for (i=0;i<16;i++)