Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a4d0c90 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

btrfs: calculate end of bio offset properly 



Use the bvec offset and len members to prepare for multipage bvecs.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 81381053

fs/btrfs/compression.c

+8 −2
Original line number Diff line number Diff line
@@ -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;