Commit 6fad823f authored by Liu Bo's avatar Liu Bo Committed by David Sterba

Btrfs: do not add extra mirror when dev_replace target dev is not available

With this, we can avoid allocating memory for dev replace copies if the
target dev is not available.
Reviewed-by: default avatarQu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 73c0f228
...@@ -5157,7 +5157,8 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len) ...@@ -5157,7 +5157,8 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len)
free_extent_map(em); free_extent_map(em);
btrfs_dev_replace_lock(&fs_info->dev_replace, 0); btrfs_dev_replace_lock(&fs_info->dev_replace, 0);
if (btrfs_dev_replace_is_ongoing(&fs_info->dev_replace)) if (btrfs_dev_replace_is_ongoing(&fs_info->dev_replace) &&
fs_info->dev_replace.tgtdev)
ret++; ret++;
btrfs_dev_replace_unlock(&fs_info->dev_replace, 0); btrfs_dev_replace_unlock(&fs_info->dev_replace, 0);
...@@ -5845,7 +5846,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, ...@@ -5845,7 +5846,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info,
} }
num_alloc_stripes = num_stripes; num_alloc_stripes = num_stripes;
if (dev_replace_is_ongoing) { if (dev_replace_is_ongoing && dev_replace->tgtdev != NULL) {
if (op == BTRFS_MAP_WRITE) if (op == BTRFS_MAP_WRITE)
num_alloc_stripes <<= 1; num_alloc_stripes <<= 1;
if (op == BTRFS_MAP_GET_READ_MIRRORS) if (op == BTRFS_MAP_GET_READ_MIRRORS)
...@@ -5858,7 +5859,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, ...@@ -5858,7 +5859,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info,
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
if (dev_replace_is_ongoing) if (dev_replace_is_ongoing && dev_replace->tgtdev != NULL)
bbio->tgtdev_map = (int *)(bbio->stripes + num_alloc_stripes); bbio->tgtdev_map = (int *)(bbio->stripes + num_alloc_stripes);
/* build raid_map */ /* build raid_map */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment