提交 2a4d0c90 编写于 作者: C Christoph Hellwig 提交者: David Sterba

btrfs: calculate end of bio offset properly

Use the bvec offset and len members to prepare for multipage bvecs.
Signed-off-by: NChristoph Hellwig <hch@lst.de>
Signed-off-by: NDavid Sterba <dsterba@suse.com>
上级 81381053
...@@ -445,6 +445,13 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, ...@@ -445,6 +445,13 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
return 0; return 0;
} }
static u64 bio_end_offset(struct bio *bio)
{
struct bio_vec *last = &bio->bi_io_vec[bio->bi_vcnt - 1];
return page_offset(last->bv_page) + last->bv_len + last->bv_offset;
}
static noinline int add_ra_bio_pages(struct inode *inode, static noinline int add_ra_bio_pages(struct inode *inode,
u64 compressed_end, u64 compressed_end,
struct compressed_bio *cb) struct compressed_bio *cb)
...@@ -463,8 +470,7 @@ static noinline int add_ra_bio_pages(struct inode *inode, ...@@ -463,8 +470,7 @@ static noinline int add_ra_bio_pages(struct inode *inode,
u64 end; u64 end;
int misses = 0; int misses = 0;
page = cb->orig_bio->bi_io_vec[cb->orig_bio->bi_vcnt - 1].bv_page; last_offset = bio_end_offset(cb->orig_bio);
last_offset = (page_offset(page) + PAGE_SIZE);
em_tree = &BTRFS_I(inode)->extent_tree; em_tree = &BTRFS_I(inode)->extent_tree;
tree = &BTRFS_I(inode)->io_tree; tree = &BTRFS_I(inode)->io_tree;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册