diff options
| author | Pavel Shilovsky <piastry@etersoft.ru> | 2011-01-31 14:03:08 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-02-04 05:41:06 +0100 |
| commit | 76429c148b939f5a6863c0a024eb8960ae91469a (patch) | |
| tree | 8c92827731a52e921755f4a24e9c46ad0882f033 /fs/cifs/file.c | |
| parent | cifs: fix length vs. total_read confusion in cifs_demultiplex_thread (diff) | |
| download | linux-76429c148b939f5a6863c0a024eb8960ae91469a.tar.xz linux-76429c148b939f5a6863c0a024eb8960ae91469a.zip | |
CIFS: Fix variable types in cifs_iovec_read/write (try #2)
Variable 'i' should be unsigned long as it's used in circle with num_pages,
and bytes_read/total_written should be ssize_t according to return value.
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/file.c')
| -rw-r--r-- | fs/cifs/file.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 74c0a282d012..e964b1cd5dd0 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1662,10 +1662,10 @@ static ssize_t cifs_iovec_write(struct file *file, const struct iovec *iov, unsigned long nr_segs, loff_t *poffset) { - size_t total_written = 0; - unsigned int written = 0; - unsigned long num_pages, npages; - size_t copied, len, cur_len, i; + unsigned int written; + unsigned long num_pages, npages, i; + size_t copied, len, cur_len; + ssize_t total_written = 0; struct kvec *to_send; struct page **pages; struct iov_iter it; @@ -1821,7 +1821,8 @@ cifs_iovec_read(struct file *file, const struct iovec *iov, { int rc; int xid; - unsigned int total_read, bytes_read = 0; + ssize_t total_read; + unsigned int bytes_read = 0; size_t len, cur_len; int iov_offset = 0; struct cifs_sb_info *cifs_sb; |