Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c2130e1 authored by Steve French's avatar Steve French Committed by Cyrill Gorcunov
Browse files

[CIFS] remove two sparse warnings 



Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 8f18c131

fs/cifs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -1755,7 +1755,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, 
	struct page *page;

	struct cifs_sb_info *cifs_sb;

	struct cifsTconInfo *pTcon;

	int bytes_read = 0;

	unsigned int bytes_read = 0;

	unsigned int read_size, i;

	char *smb_read_data = NULL;

	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;

			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 */



				/* server copy of file can have smaller size

fs/cifs/readdir.c

+3 −3
Original line number Diff line number Diff line
@@ -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,

			  char *buf, int *pobject_type, int isNewInode)

			  char *buf, unsigned int *pobject_type, int isNewInode)

{

	loff_t local_size;

	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,

	FILE_UNIX_INFO *pfindData, int *pobject_type, int isNewInode)

	FILE_UNIX_INFO *pfindData, unsigned int *pobject_type, int isNewInode)

{

	loff_t local_size;

	struct timespec local_mtime;
@@ -826,7 +826,7 @@ static int cifs_filldir(char *pfindEntry, struct file *file, 
	int rc = 0;

	struct qstr qstring;

	struct cifsFileInfo *pCifsF;

	unsigned obj_type;

	unsigned int obj_type;

	ino_t  inum;

	struct cifs_sb_info *cifs_sb;

	struct inode *tmp_inode;