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.
Showing the changes to include/linux (1 of 2 files). Show all
Unified · Split
| @@ -263,12 +263,6 @@ static inline void bio_get_last_bvec(struct bio *bio, struct bio_vec *bv) · 262 unmodified lines | ||
| 263 | 263 | bv->bv_len = iter.bi_bvec_done; |
| 264 | 264 | } |
| 265 | 265 | |
| 266 | −static inline unsigned bio_pages_all(struct bio *bio) | |
| 267 | −{ | |
| 268 | − WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED)); | |
| 269 | − return bio->bi_vcnt; | |
| 270 | −} | |
| 271 | − | |
| 272 | 266 | static inline struct bio_vec *bio_first_bvec_all(struct bio *bio) |
| 273 | 267 | { |
| 274 | 268 | WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED)); |