|
|
@@ -8334,7 +8334,7 @@ static int btrfs_submit_direct_hook(struct btrfs_dio_private *dip,
|
|
|
struct btrfs_root *root = BTRFS_I(inode)->root;
|
|
|
struct bio *bio;
|
|
|
struct bio *orig_bio = dip->orig_bio;
|
|
|
- struct bio_vec *bvec = orig_bio->bi_io_vec;
|
|
|
+ struct bio_vec *bvec;
|
|
|
u64 start_sector = orig_bio->bi_iter.bi_sector;
|
|
|
u64 file_offset = dip->logical_offset;
|
|
|
u64 submit_len = 0;
|
|
|
@@ -8343,7 +8343,7 @@ static int btrfs_submit_direct_hook(struct btrfs_dio_private *dip,
|
|
|
int async_submit = 0;
|
|
|
int nr_sectors;
|
|
|
int ret;
|
|
|
- int i;
|
|
|
+ int i, j;
|
|
|
|
|
|
map_length = orig_bio->bi_iter.bi_size;
|
|
|
ret = btrfs_map_block(root->fs_info, btrfs_op(orig_bio),
|
|
|
@@ -8373,7 +8373,7 @@ static int btrfs_submit_direct_hook(struct btrfs_dio_private *dip,
|
|
|
btrfs_io_bio(bio)->logical = file_offset;
|
|
|
atomic_inc(&dip->pending_bios);
|
|
|
|
|
|
- while (bvec <= (orig_bio->bi_io_vec + orig_bio->bi_vcnt - 1)) {
|
|
|
+ bio_for_each_segment_all(bvec, orig_bio, j) {
|
|
|
nr_sectors = BTRFS_BYTES_TO_BLKS(root->fs_info, bvec->bv_len);
|
|
|
i = 0;
|
|
|
next_block:
|
|
|
@@ -8427,7 +8427,6 @@ next_block:
|
|
|
i++;
|
|
|
goto next_block;
|
|
|
}
|
|
|
- bvec++;
|
|
|
}
|
|
|
}
|
|
|
|