History

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.

Christoph Hellwig committed 7 years ago

Commit 8a2ee441 parent fbd72122 files · +1 −7Browse files

Unified · Split

2 files
  1. fs/btrfs/extent_io.c +1 −1
  2. include/linux/bio.h +0 −6
fs/btrfs/extent_io.c+1−1
@@ -2350,7 +2350,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset, · 2349 unmodified lines
2350 int read_mode = 0;2350 int read_mode = 0;
2351 blk_status_t status;2351 blk_status_t status;
2352 int ret;2352 int ret;
2353 unsigned failed_bio_pages = bio_pages_all(failed_bio);2353 unsigned failed_bio_pages = failed_bio->bi_iter.bi_size >> PAGE_SHIFT;
2354 2354
2355 BUG_ON(bio_op(failed_bio) == REQ_OP_WRITE);2355 BUG_ON(bio_op(failed_bio) == REQ_OP_WRITE);
2356 2356
include/linux/bio.h+0−6
@@ -263,12 +263,6 @@ static inline void bio_get_last_bvec(struct bio *bio, struct bio_vec *bv) · 262 unmodified lines
263 bv->bv_len = iter.bi_bvec_done;263 bv->bv_len = iter.bi_bvec_done;
264}264}
265 265
266static 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
272static inline struct bio_vec *bio_first_bvec_all(struct bio *bio)266static inline struct bio_vec *bio_first_bvec_all(struct bio *bio)
273{267{
274 WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED));268 WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED));

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t