diff options
author | Liu Bo <bo.li.liu@oracle.com> | 2017-05-16 01:33:27 +0300 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2017-06-19 19:25:59 +0300 |
commit | 17347cec15f919901c90cdbf98af47ed2ed28b9f (patch) | |
tree | 27fa6d42856840f59bf9cc1cb042ee234a355cf1 /fs/btrfs/extent_io.c | |
parent | 725130bac5857ac035cf9f47d2973ee4e734db54 (diff) | |
download | linux-17347cec15f919901c90cdbf98af47ed2ed28b9f.tar.xz |
Btrfs: change how we iterate bios in endio
Since dio submit has used bio_clone_fast, the submitted bio may not have a
reliable bi_vcnt, for the bio vector iterations in checksum related
functions, bio->bi_iter is not modified yet and it's safe to use
bio_for_each_segment, while for those bio vector iterations in dio read's
endio, we now save a copy of bvec_iter in struct btrfs_io_bio when cloning
bios and use the helper __bio_for_each_segment with the saved bvec_iter to
access each bvec.
Also for dio reads which don't get split, we also need to save a copy of
bio iterator in btrfs_bio_clone to let __bio_for_each_segments to access
each bvec in dio read's endio. Note that it doesn't affect other calls of
btrfs_bio_clone() because they don't need to use this iterator.
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/extent_io.c')
-rw-r--r-- | fs/btrfs/extent_io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index db2bbf92b4bc..acb8c1d177e2 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2700,6 +2700,7 @@ struct bio *btrfs_bio_clone(struct bio *bio, gfp_t gfp_mask) btrfs_bio->csum = NULL; btrfs_bio->csum_allocated = NULL; btrfs_bio->end_io = NULL; + btrfs_bio->iter = bio->bi_iter; } return new; } @@ -2736,6 +2737,7 @@ struct bio *btrfs_bio_clone_partial(struct bio *orig, gfp_t gfp_mask, btrfs_bio->end_io = NULL; bio_trim(bio, offset >> 9, size >> 9); + btrfs_bio->iter = bio->bi_iter; return bio; } |