On Thu, Nov 15, 2018 at 04:52:54PM +0800, Ming Lei wrote: > Preparing for supporting multi-page bvec. > > Cc: Dave Chinner <[email protected]> > Cc: Kent Overstreet <[email protected]> > Cc: Mike Snitzer <[email protected]> > Cc: [email protected] > Cc: Alexander Viro <[email protected]> > Cc: [email protected] > Cc: Shaohua Li <[email protected]> > Cc: [email protected] > Cc: [email protected] > Cc: David Sterba <[email protected]> > Cc: [email protected] > Cc: Darrick J. Wong <[email protected]> > Cc: [email protected] > Cc: Gao Xiang <[email protected]> > Cc: Christoph Hellwig <[email protected]> > Cc: Theodore Ts'o <[email protected]> > Cc: [email protected] > Cc: Coly Li <[email protected]> > Cc: [email protected] > Cc: Boaz Harrosh <[email protected]> > Cc: Bob Peterson <[email protected]> > Cc: [email protected]
Reviewed-by: Omar Sandoval <[email protected]> > Signed-off-by: Ming Lei <[email protected]> > --- > fs/btrfs/compression.c | 5 ++++- > fs/btrfs/extent_io.c | 5 +++-- > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c > index 2955a4ea2fa8..161e14b8b180 100644 > --- a/fs/btrfs/compression.c > +++ b/fs/btrfs/compression.c > @@ -400,8 +400,11 @@ blk_status_t btrfs_submit_compressed_write(struct inode > *inode, u64 start, > static u64 bio_end_offset(struct bio *bio) > { > struct bio_vec *last = bio_last_bvec_all(bio); > + struct bio_vec bv; > > - return page_offset(last->bv_page) + last->bv_len + last->bv_offset; > + bvec_last_segment(last, &bv); > + > + return page_offset(bv.bv_page) + bv.bv_len + bv.bv_offset; > } > > static noinline int add_ra_bio_pages(struct inode *inode, > diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c > index d228f706ff3e..5d5965297e7e 100644 > --- a/fs/btrfs/extent_io.c > +++ b/fs/btrfs/extent_io.c > @@ -2720,11 +2720,12 @@ static int __must_check submit_one_bio(struct bio > *bio, int mirror_num, > { > blk_status_t ret = 0; > struct bio_vec *bvec = bio_last_bvec_all(bio); > - struct page *page = bvec->bv_page; > + struct bio_vec bv; > struct extent_io_tree *tree = bio->bi_private; > u64 start; > > - start = page_offset(page) + bvec->bv_offset; > + bvec_last_segment(bvec, &bv); > + start = page_offset(bv.bv_page) + bv.bv_offset; > > bio->bi_private = NULL; > > -- > 2.9.5 >
