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

Commit 8a2ee44a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

btrfs: look at bi_size for repair decisions 



bio_readpage_error currently uses bi_vcnt to decide if it is worth
retrying an I/O.  But the vector count is mostly an implementation
artifact - it really should figure out if there is more than a
single sector worth retrying.  Use bi_size for that and shift by
PAGE_SHIFT.  This really should be blocks/sectors, but given that
btrfs doesn't support a sector size different from the PAGE_SIZE
using the page size keeps the changes to a minimum.

Reviewed-by: default avatarOmar Sandoval <osandov@fb.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent fbd72127

fs/btrfs/extent_io.c

+1 −1
Original line number Diff line number Diff line
@@ -2350,7 +2350,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 = failed_bio->bi_iter.bi_size >> PAGE_SHIFT;



	BUG_ON(bio_op(failed_bio) == REQ_OP_WRITE);

include/linux/bio.h

+0 −6
Original line number Diff line number Diff line
@@ -263,12 +263,6 @@ static inline void bio_get_last_bvec(struct bio *bio, struct bio_vec *bv) 
		bv->bv_len = iter.bi_bvec_done;

}



static inline unsigned bio_pages_all(struct bio *bio)

{

	WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED));

	return bio->bi_vcnt;

}



static inline struct bio_vec *bio_first_bvec_all(struct bio *bio)

{

	WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED));