xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ceph: cleanup types in striped_read()

Browse Source 
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>
This commit is contained in:
Dan Carpenter
2013-07-23 16:48:01 +03:00
committed by Sage Weil
parent ca20c99191
commit 688bac461b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/ceph/file.c
View File

@@ -313,9 +313,9 @@ static int striped_read(struct inode *inode,
{ {
struct ceph_fs_client *fsc = ceph_inode_to_client(inode); struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
struct ceph_inode_info *ci = ceph_inode(inode); struct ceph_inode_info *ci = ceph_inode(inode);
u64 pos, this_len; u64 pos, this_len, left;
int io_align, page_align; int io_align, page_align;
int left, pages_left; int pages_left;
int read; int read;
struct page **page_pos; struct page **page_pos;
int ret; int ret;
@@ -346,7 +346,7 @@ more:
ret = 0; ret = 0;
hit_stripe = this_len < left; hit_stripe = this_len < left;
was_short = ret >= 0 && ret < this_len; 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" : ""); ret, hit_stripe ? " HITSTRIPE" : "", was_short ? " SHORT" : "");
if (ret > 0) { if (ret > 0) {
@@ -378,7 +378,7 @@ more:
if (pos + left > inode->i_size) if (pos + left > inode->i_size)
left = inode->i_size - pos; 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, ceph_zero_page_vector_range(page_align + read, left,
pages); pages);
read += left; read += left;