diff options
| author |   Christoph Hellwig <hch@lst.de> | 2019-02-15 19:13:07 +0800 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2019-02-15 08:40:10 -0700 |
| commit | 8a2ee44a371c8cbef587ea609908c3cbf1645231 (patch) | |
| tree | c9ecfab2ea5857d120f4768fe8b110203cab9ef9 /fs | |
| parent | block: avoid setting none scheduler if it's already none (diff) | |
| download | linux-dev-8a2ee44a371c8cbef587ea609908c3cbf1645231.tar.xz linux-dev-8a2ee44a371c8cbef587ea609908c3cbf1645231.zip | |
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: Omar Sandoval <osandov@fb.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/extent_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 52abe4082680..dc8ba3ee515d 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -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); |