diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-07-23 16:48:01 +0300 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-09 17:55:15 -0700 |
| commit | 688bac461ba3e9d221a879ab40b687f5d7b5b19c (patch) | |
| tree | 87f958e5266d6ea29b9d448ce2e099bc383448c6 /fs | |
| parent | ca20c991917ef6a98d6b40184fefe981727d9328 (diff) | |
| download | op-kernel-dev-688bac461ba3e9d221a879ab40b687f5d7b5b19c.zip op-kernel-dev-688bac461ba3e9d221a879ab40b687f5d7b5b19c.tar.gz | |
ceph: cleanup types in striped_read()
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>
Diffstat (limited to 'fs')
| -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 a44d515..7d4e769 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -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; @@ -346,7 +346,7 @@ more: 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) { @@ -378,7 +378,7 @@ more: 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; |
