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

Commit b25e59e2 authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: drop uuid_mutex in btrfs_dev_replace_finishing 



btrfs_dev_replace_finishing updates devices (soruce and target) which
are within the btrfs_fs_devices::devices or withint the cloned seed
devices (btrfs_fs_devices::seed::devices), so we don't need the global
uuid_mutex.

The device replace context is also locked by its own locks.

Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 542c5908

fs/btrfs/dev-replace.c

+0 −3
Original line number Diff line number Diff line
@@ -609,7 +609,6 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
	ret = btrfs_commit_transaction(trans);

	WARN_ON(ret);



	mutex_lock(&uuid_mutex);

	/* keep away write_all_supers() during the finishing procedure */

	mutex_lock(&fs_info->fs_devices->device_list_mutex);

	mutex_lock(&fs_info->chunk_mutex);
@@ -636,7 +635,6 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
		btrfs_dev_replace_write_unlock(dev_replace);

		mutex_unlock(&fs_info->chunk_mutex);

		mutex_unlock(&fs_info->fs_devices->device_list_mutex);

		mutex_unlock(&uuid_mutex);

		btrfs_rm_dev_replace_blocked(fs_info);

		if (tgt_device)

			btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device);
@@ -687,7 +685,6 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
	 */

	mutex_unlock(&fs_info->chunk_mutex);

	mutex_unlock(&fs_info->fs_devices->device_list_mutex);

	mutex_unlock(&uuid_mutex);



	/* replace the sysfs entry */

	btrfs_sysfs_rm_device_link(fs_info->fs_devices, src_device);