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

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

btrfs: use common variable for fs_devices in btrfs_destroy_dev_replace_tgtdev 



Use a local btrfs_fs_devices variable to access the structure.

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 ab5c2f65

fs/btrfs/volumes.c

+7 −5
Original line number Diff line number Diff line
@@ -2152,21 +2152,23 @@ void btrfs_rm_dev_replace_free_srcdev(struct btrfs_fs_info *fs_info, 
void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,

				      struct btrfs_device *tgtdev)

{

	struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;



	WARN_ON(!tgtdev);

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

	mutex_lock(&fs_devices->device_list_mutex);



	btrfs_sysfs_rm_device_link(fs_info->fs_devices, tgtdev);

	btrfs_sysfs_rm_device_link(fs_devices, tgtdev);



	if (tgtdev->bdev)

		fs_info->fs_devices->open_devices--;

		fs_devices->open_devices--;



	fs_info->fs_devices->num_devices--;

	fs_devices->num_devices--;



	btrfs_assign_next_active_device(fs_info, tgtdev, NULL);



	list_del_rcu(&tgtdev->dev_list);



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

	mutex_unlock(&fs_devices->device_list_mutex);



	/*

	 * The update_dev_time() with in btrfs_scratch_superblocks()