public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ceph: fix page alignment corrections

Browse source 
dd if=/dev/urandom of=/mnt/fs_depot/dd10 bs=500 seek=8388 count=1
 dd if=/mnt/fs_depot/dd10 of=/root/dd10out bs=500 skip=8388 count=1

Reported-by: Henry C Chang <henry.cy.chang@gmail.com>
Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2011-06-07 20:57:14 -07:00
parent 0c1f91f271
commit 773e9b4426
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/ceph/file.c
View file

@ -290,7 +290,6 @@ static int striped_read(struct inode *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;
int io_align, page_align; int io_align, page_align;
int page_off = off & ~PAGE_CACHE_MASK; /* first byte's offset in page */
int left, pages_left; int left, pages_left;
int read; int read;
struct page **page_pos; struct page **page_pos;
@ -326,12 +325,11 @@ more:
ret, hit_stripe ? " HITSTRIPE" : "", was_short ? " SHORT" : ""); ret, hit_stripe ? " HITSTRIPE" : "", was_short ? " SHORT" : "");
if (ret > 0) { if (ret > 0) {
int didpages = int didpages = (page_align + ret) >> PAGE_CACHE_SHIFT;
((pos & ~PAGE_CACHE_MASK) + ret) >> PAGE_CACHE_SHIFT;
if (read < pos - off) { if (read < pos - off) {
dout(" zero gap %llu to %llu\n", off + read, pos); dout(" zero gap %llu to %llu\n", off + read, pos);
ceph_zero_page_vector_range(page_off + read, ceph_zero_page_vector_range(page_align + read,
pos - off - read, pages); pos - off - read, pages);
} }
pos += ret; pos += ret;
@ -356,7 +354,7 @@ more:
left = inode->i_size - pos; left = inode->i_size - pos;
dout("zero tail %d\n", left); dout("zero tail %d\n", left);
ceph_zero_page_vector_range(page_off + read, left, ceph_zero_page_vector_range(page_align + read, left,
pages); pages);
read += left; read += left;
} }