Browse Source

[CIFS] remove two sparse warnings

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Steve French 17 years ago
parent
commit
2c2130e16f
2 changed files with 5 additions and 5 deletions
  1. 2 2
      fs/cifs/file.c
  2. 3 3
      fs/cifs/readdir.c

+ 2 - 2
fs/cifs/file.c

@@ -1755,7 +1755,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
 	struct page *page;
 	struct page *page;
 	struct cifs_sb_info *cifs_sb;
 	struct cifs_sb_info *cifs_sb;
 	struct cifsTconInfo *pTcon;
 	struct cifsTconInfo *pTcon;
-	int bytes_read = 0;
+	unsigned int bytes_read = 0;
 	unsigned int read_size, i;
 	unsigned int read_size, i;
 	char *smb_read_data = NULL;
 	char *smb_read_data = NULL;
 	struct smb_com_read_rsp *pSMBr;
 	struct smb_com_read_rsp *pSMBr;
@@ -1849,7 +1849,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
 
 
 			i +=  bytes_read >> PAGE_CACHE_SHIFT;
 			i +=  bytes_read >> PAGE_CACHE_SHIFT;
 			cifs_stats_bytes_read(pTcon, bytes_read);
 			cifs_stats_bytes_read(pTcon, bytes_read);
-			if ((int)(bytes_read & PAGE_CACHE_MASK) != bytes_read) {
+			if ((bytes_read & PAGE_CACHE_MASK) != bytes_read) {
 				i++; /* account for partial page */
 				i++; /* account for partial page */
 
 
 				/* server copy of file can have smaller size
 				/* server copy of file can have smaller size

+ 3 - 3
fs/cifs/readdir.c

@@ -121,7 +121,7 @@ static void AdjustForTZ(struct cifsTconInfo *tcon, struct inode *inode)
 
 
 
 
 static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
 static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
-			  char *buf, int *pobject_type, int isNewInode)
+			  char *buf, unsigned int *pobject_type, int isNewInode)
 {
 {
 	loff_t local_size;
 	loff_t local_size;
 	struct timespec local_mtime;
 	struct timespec local_mtime;
@@ -294,7 +294,7 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
 }
 }
 
 
 static void unix_fill_in_inode(struct inode *tmp_inode,
 static void unix_fill_in_inode(struct inode *tmp_inode,
-	FILE_UNIX_INFO *pfindData, int *pobject_type, int isNewInode)
+	FILE_UNIX_INFO *pfindData, unsigned int *pobject_type, int isNewInode)
 {
 {
 	loff_t local_size;
 	loff_t local_size;
 	struct timespec local_mtime;
 	struct timespec local_mtime;
@@ -826,7 +826,7 @@ static int cifs_filldir(char *pfindEntry, struct file *file,
 	int rc = 0;
 	int rc = 0;
 	struct qstr qstring;
 	struct qstr qstring;
 	struct cifsFileInfo *pCifsF;
 	struct cifsFileInfo *pCifsF;
-	unsigned obj_type;
+	unsigned int obj_type;
 	ino_t  inum;
 	ino_t  inum;
 	struct cifs_sb_info *cifs_sb;
 	struct cifs_sb_info *cifs_sb;
 	struct inode *tmp_inode;
 	struct inode *tmp_inode;