Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/btrfs/volumes.c

+4 −3
Original line number Diff line number Diff line
@@ -5157,7 +5157,8 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len) 
	free_extent_map(em);



	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++;

	btrfs_dev_replace_unlock(&fs_info->dev_replace, 0);
@@ -5845,7 +5846,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, 
	}



	num_alloc_stripes = num_stripes;

	if (dev_replace_is_ongoing) {

	if (dev_replace_is_ongoing && dev_replace->tgtdev != NULL) {

		if (op == BTRFS_MAP_WRITE)

			num_alloc_stripes <<= 1;

		if (op == BTRFS_MAP_GET_READ_MIRRORS)
@@ -5858,7 +5859,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, 
		ret = -ENOMEM;

		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);



	/* build raid_map */