diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-07-23 09:48:01 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-09 15:24:25 -0500 |
commit | 10debbda102fe52eb75ba531b8ee79e98d3b8774 (patch) | |
tree | 635d37d69b12190ba775f31ab76a6a24cf769c19 /fs/ceph | |
parent | acb2e930c72a1d38504d6d9c1f338562bbb9aa55 (diff) |
ceph: cleanup types in striped_read()
commit 688bac461ba3e9d221a879ab40b687f5d7b5b19c upstream.
We pass in a u64 value for "len" and then immediately truncate away the
upper 32 bits.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Alex Elder <alex.elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ceph')
-rw-r--r-- | fs/ceph/file.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 656e16907430..5b9baf5a867f 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c | |||
@@ -313,9 +313,9 @@ static int striped_read(struct inode *inode, | |||
313 | { | 313 | { |
314 | struct ceph_fs_client *fsc = ceph_inode_to_client(inode); | 314 | struct ceph_fs_client *fsc = ceph_inode_to_client(inode); |
315 | struct ceph_inode_info *ci = ceph_inode(inode); | 315 | struct ceph_inode_info *ci = ceph_inode(inode); |
316 | u64 pos, this_len; | 316 | u64 pos, this_len, left; |
317 | int io_align, page_align; | 317 | int io_align, page_align; |
318 | int left, pages_left; | 318 | int pages_left; |
319 | int read; | 319 | int read; |
320 | struct page **page_pos; | 320 | struct page **page_pos; |
321 | int ret; | 321 | int ret; |
@@ -346,7 +346,7 @@ more: | |||
346 | ret = 0; | 346 | ret = 0; |
347 | hit_stripe = this_len < left; | 347 | hit_stripe = this_len < left; |
348 | was_short = ret >= 0 && ret < this_len; | 348 | was_short = ret >= 0 && ret < this_len; |
349 | dout("striped_read %llu~%u (read %u) got %d%s%s\n", pos, left, read, | 349 | dout("striped_read %llu~%llu (read %u) got %d%s%s\n", pos, left, read, |
350 | ret, hit_stripe ? " HITSTRIPE" : "", was_short ? " SHORT" : ""); | 350 | ret, hit_stripe ? " HITSTRIPE" : "", was_short ? " SHORT" : ""); |
351 | 351 | ||
352 | if (ret > 0) { | 352 | if (ret > 0) { |
@@ -378,7 +378,7 @@ more: | |||
378 | if (pos + left > inode->i_size) | 378 | if (pos + left > inode->i_size) |
379 | left = inode->i_size - pos; | 379 | left = inode->i_size - pos; |
380 | 380 | ||
381 | dout("zero tail %d\n", left); | 381 | dout("zero tail %llu\n", left); |
382 | ceph_zero_page_vector_range(page_align + read, left, | 382 | ceph_zero_page_vector_range(page_align + read, left, |
383 | pages); | 383 | pages); |
384 | read += left; | 384 | read += left; |