From: Christoph Hellwig Date: Fri, 25 Nov 2016 08:07:51 +0000 (+0100) Subject: btrfs: calculate end of bio offset properly X-Git-Tag: Ubuntu-4.10.0-7.9~885^2~24^2~7 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2a4d0c9068a6cbd94086953e45625505891490b2;p=mirror_ubuntu-zesty-kernel.git btrfs: calculate end of bio offset properly Use the bvec offset and len members to prepare for multipage bvecs. Signed-off-by: Christoph Hellwig Signed-off-by: David Sterba --- diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 1a618cb5370b..ae4c000cbffc 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -445,6 +445,13 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 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, u64 compressed_end, struct compressed_bio *cb) @@ -463,8 +470,7 @@ static noinline int add_ra_bio_pages(struct inode *inode, u64 end; int misses = 0; - page = cb->orig_bio->bi_io_vec[cb->orig_bio->bi_vcnt - 1].bv_page; - last_offset = (page_offset(page) + PAGE_SIZE); + last_offset = bio_end_offset(cb->orig_bio); em_tree = &BTRFS_I(inode)->extent_tree; tree = &BTRFS_I(inode)->io_tree;