On Thu, Nov 15, 2018 at 04:52:55PM +0800, Ming Lei wrote: > BTRFS is the only user of this helper, so move this helper into > BTRFS, and implement it via bio_for_each_segment_all(), since > bio->bi_vcnt may not equal to number of pages after multipage bvec > is enabled.
Shouldn't you also get rid of bio_pages_all() in this patch? > 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] > Signed-off-by: Ming Lei <[email protected]> > --- > fs/btrfs/extent_io.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c > index 5d5965297e7e..874bb9aeebdc 100644 > --- a/fs/btrfs/extent_io.c > +++ b/fs/btrfs/extent_io.c > @@ -2348,6 +2348,18 @@ struct bio *btrfs_create_repair_bio(struct inode > *inode, struct bio *failed_bio, > return bio; > } > > +static unsigned btrfs_bio_pages_all(struct bio *bio) > +{ > + unsigned i; > + struct bio_vec *bv; > + > + WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED)); > + > + bio_for_each_segment_all(bv, bio, i) > + ; > + return i; > +} > + > /* > * this is a generic handler for readpage errors (default > * readpage_io_failed_hook). if other copies exist, read those and write back > @@ -2368,7 +2380,7 @@ static int bio_readpage_error(struct bio *failed_bio, > u64 phy_offset, > int read_mode = 0; > blk_status_t status; > int ret; > - unsigned failed_bio_pages = bio_pages_all(failed_bio); > + unsigned failed_bio_pages = btrfs_bio_pages_all(failed_bio); > > BUG_ON(bio_op(failed_bio) == REQ_OP_WRITE); > > -- > 2.9.5 >
