Skip to content

Commit

Permalink
ceph: cleanup types in striped_read()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Carpenter authored and Sage Weil committed Aug 10, 2013
1 parent ca20c99 commit 688bac4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions fs/ceph/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,9 @@ static int striped_read(struct inode *inode,
{
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
struct ceph_inode_info *ci = ceph_inode(inode);
u64 pos, this_len;
u64 pos, this_len, left;
int io_align, page_align;
int left, pages_left;
int pages_left;
int read;
struct page **page_pos;
int ret;
Expand Down Expand Up @@ -346,7 +346,7 @@ static int striped_read(struct inode *inode,
ret = 0;
hit_stripe = this_len < left;
was_short = ret >= 0 && ret < this_len;
dout("striped_read %llu~%u (read %u) got %d%s%s\n", pos, left, read,
dout("striped_read %llu~%llu (read %u) got %d%s%s\n", pos, left, read,
ret, hit_stripe ? " HITSTRIPE" : "", was_short ? " SHORT" : "");

if (ret > 0) {
Expand Down Expand Up @@ -378,7 +378,7 @@ static int striped_read(struct inode *inode,
if (pos + left > inode->i_size)
left = inode->i_size - pos;

dout("zero tail %d\n", left);
dout("zero tail %llu\n", left);
ceph_zero_page_vector_range(page_align + read, left,
pages);
read += left;
Expand Down

0 comments on commit 688bac4

Please sign in to comment.