btrfs: cache stripe tree usage in struct btrfs_io_geometry

Cache the return of btrfs_need_stripe_tree_update() in struct
btrfs_io_geometry starting from btrfs_map_block().

Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 1cccaf9c2b0d5d4029440c46a4a92c7d6541d474..fa190f7108545eacf82ef2b5f1f3838d56ca683e 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -48,6 +48,7 @@ struct btrfs_io_geometry {
        u64 raid56_full_stripe_start;
        int max_errors;
        enum btrfs_map_op op;
+       bool use_rst;
 };
 
 const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = {
@@ -6346,8 +6347,7 @@ static int set_io_stripe(struct btrfs_fs_info *fs_info, u64 logical,
 {
        dst->dev = map->stripes[io_geom->stripe_index].dev;
 
-       if (io_geom->op == BTRFS_MAP_READ &&
-           btrfs_need_stripe_tree_update(fs_info, map->type))
+       if (io_geom->op == BTRFS_MAP_READ && io_geom->use_rst)
                return btrfs_get_raid_extent_offset(fs_info, logical, length,
                                                    map->type,
                                                    io_geom->stripe_index, dst);
@@ -6579,6 +6579,7 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
        io_geom.raid56_full_stripe_start = (u64)-1;
        max_len = btrfs_max_io_len(map, map_offset, &io_geom);
        *length = min_t(u64, map->chunk_len - map_offset, max_len);
+       io_geom.use_rst = btrfs_need_stripe_tree_update(fs_info, map->type);
 
        if (dev_replace->replace_task != current)
                down_read(&dev_replace->rwsem);