diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cifs/file.c | 4 | ||||
-rw-r--r-- | fs/cifs/readdir.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 780c0e3e4703..1e7e4c06d9e3 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
@@ -1755,7 +1755,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, | |||
1755 | struct page *page; | 1755 | struct page *page; |
1756 | struct cifs_sb_info *cifs_sb; | 1756 | struct cifs_sb_info *cifs_sb; |
1757 | struct cifsTconInfo *pTcon; | 1757 | struct cifsTconInfo *pTcon; |
1758 | int bytes_read = 0; | 1758 | unsigned int bytes_read = 0; |
1759 | unsigned int read_size, i; | 1759 | unsigned int read_size, i; |
1760 | char *smb_read_data = NULL; | 1760 | char *smb_read_data = NULL; |
1761 | struct smb_com_read_rsp *pSMBr; | 1761 | struct smb_com_read_rsp *pSMBr; |
@@ -1849,7 +1849,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, | |||
1849 | 1849 | ||
1850 | i += bytes_read >> PAGE_CACHE_SHIFT; | 1850 | i += bytes_read >> PAGE_CACHE_SHIFT; |
1851 | cifs_stats_bytes_read(pTcon, bytes_read); | 1851 | cifs_stats_bytes_read(pTcon, bytes_read); |
1852 | if ((int)(bytes_read & PAGE_CACHE_MASK) != bytes_read) { | 1852 | if ((bytes_read & PAGE_CACHE_MASK) != bytes_read) { |
1853 | i++; /* account for partial page */ | 1853 | i++; /* account for partial page */ |
1854 | 1854 | ||
1855 | /* server copy of file can have smaller size | 1855 | /* server copy of file can have smaller size |
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index b5a9bfff5e50..3746580e9701 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c | |||
@@ -121,7 +121,7 @@ static void AdjustForTZ(struct cifsTconInfo *tcon, struct inode *inode) | |||
121 | 121 | ||
122 | 122 | ||
123 | static void fill_in_inode(struct inode *tmp_inode, int new_buf_type, | 123 | static void fill_in_inode(struct inode *tmp_inode, int new_buf_type, |
124 | char *buf, int *pobject_type, int isNewInode) | 124 | char *buf, unsigned int *pobject_type, int isNewInode) |
125 | { | 125 | { |
126 | loff_t local_size; | 126 | loff_t local_size; |
127 | struct timespec local_mtime; | 127 | struct timespec local_mtime; |
@@ -294,7 +294,7 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type, | |||
294 | } | 294 | } |
295 | 295 | ||
296 | static void unix_fill_in_inode(struct inode *tmp_inode, | 296 | static void unix_fill_in_inode(struct inode *tmp_inode, |
297 | FILE_UNIX_INFO *pfindData, int *pobject_type, int isNewInode) | 297 | FILE_UNIX_INFO *pfindData, unsigned int *pobject_type, int isNewInode) |
298 | { | 298 | { |
299 | loff_t local_size; | 299 | loff_t local_size; |
300 | struct timespec local_mtime; | 300 | struct timespec local_mtime; |
@@ -826,7 +826,7 @@ static int cifs_filldir(char *pfindEntry, struct file *file, | |||
826 | int rc = 0; | 826 | int rc = 0; |
827 | struct qstr qstring; | 827 | struct qstr qstring; |
828 | struct cifsFileInfo *pCifsF; | 828 | struct cifsFileInfo *pCifsF; |
829 | unsigned obj_type; | 829 | unsigned int obj_type; |
830 | ino_t inum; | 830 | ino_t inum; |
831 | struct cifs_sb_info *cifs_sb; | 831 | struct cifs_sb_info *cifs_sb; |
832 | struct inode *tmp_inode; | 832 | struct inode *tmp_inode; |