btrfs: record btrfs_device directly in btrfs_io_bio

[linux-block.git] / fs / btrfs / volumes.c

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index f403fb1e6d379358e9e6d7173288ecb34bbde8a0..fb3502166e29b5b061121d2c072771515fe6a2f0 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -3231,7 +3231,7 @@ static int del_balance_item(struct btrfs_fs_info *fs_info)
        if (!path)
                return -ENOMEM;
 
-       trans = btrfs_start_transaction(root, 0);
+       trans = btrfs_start_transaction_fallback_global_rsv(root, 0);
        if (IS_ERR(trans)) {
                btrfs_free_path(path);
                return PTR_ERR(trans);
@@ -6261,12 +6261,8 @@ static void btrfs_end_bio(struct bio *bio)
                atomic_inc(&bbio->error);
                if (bio->bi_status == BLK_STS_IOERR ||
                    bio->bi_status == BLK_STS_TARGET) {
-                       unsigned int stripe_index =
-                               btrfs_io_bio(bio)->stripe_index;
-                       struct btrfs_device *dev;
+                       struct btrfs_device *dev = btrfs_io_bio(bio)->device;
 
-                       BUG_ON(stripe_index >= bbio->num_stripes);
-                       dev = bbio->stripes[stripe_index].dev;
                        if (dev->bdev) {
                                if (bio_op(bio) == REQ_OP_WRITE)
                                        btrfs_dev_stat_inc_and_print(dev,
@@ -6313,13 +6309,12 @@ static void btrfs_end_bio(struct bio *bio)
 }
 
 static void submit_stripe_bio(struct btrfs_bio *bbio, struct bio *bio,
-                             u64 physical, int dev_nr)
+                             u64 physical, struct btrfs_device *dev)
 {
-       struct btrfs_device *dev = bbio->stripes[dev_nr].dev;
        struct btrfs_fs_info *fs_info = bbio->fs_info;
 
        bio->bi_private = bbio;
-       btrfs_io_bio(bio)->stripe_index = dev_nr;
+       btrfs_io_bio(bio)->device = dev;
        bio->bi_end_io = btrfs_end_bio;
        bio->bi_iter.bi_sector = physical >> 9;
        btrfs_debug_in_rcu(fs_info,
@@ -6420,8 +6415,7 @@ blk_status_t btrfs_map_bio(struct btrfs_fs_info *fs_info, struct bio *bio,
                else
                        bio = first_bio;
 
-               submit_stripe_bio(bbio, bio, bbio->stripes[dev_nr].physical,
-                                 dev_nr);
+               submit_stripe_bio(bbio, bio, bbio->stripes[dev_nr].physical, dev);
        }
        btrfs_bio_counter_dec(fs_info);
        return BLK_STS_OK;