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

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

btrfs: move volume_mutex into the btrfs_rm_device() 



A cleanup patch no functional change, we hold volume_mutex before
calling btrfs_rm_device, so move it into the function itself.

Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 96b09dde

fs/btrfs/ioctl.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -2675,14 +2675,12 @@ static long btrfs_ioctl_rm_dev_v2(struct file *file, void __user *arg) 
		goto out;

		goto out;

	}

	}





	mutex_lock(&fs_info->volume_mutex);

	if (vol_args->flags & BTRFS_DEVICE_SPEC_BY_ID) {

	if (vol_args->flags & BTRFS_DEVICE_SPEC_BY_ID) {

		ret = btrfs_rm_device(fs_info, NULL, vol_args->devid);

		ret = btrfs_rm_device(fs_info, NULL, vol_args->devid);

	} else {

	} else {

		vol_args->name[BTRFS_SUBVOL_NAME_MAX] = '\0';

		vol_args->name[BTRFS_SUBVOL_NAME_MAX] = '\0';

		ret = btrfs_rm_device(fs_info, vol_args->name, 0);

		ret = btrfs_rm_device(fs_info, vol_args->name, 0);

	}

	}

	mutex_unlock(&fs_info->volume_mutex);

	clear_bit(BTRFS_FS_EXCL_OP, &fs_info->flags);

	clear_bit(BTRFS_FS_EXCL_OP, &fs_info->flags);





	if (!ret) {

	if (!ret) {
@@ -2726,9 +2724,7 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg) 
	}

	}





	vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';

	vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';

	mutex_lock(&fs_info->volume_mutex);

	ret = btrfs_rm_device(fs_info, vol_args->name, 0);

	ret = btrfs_rm_device(fs_info, vol_args->name, 0);

	mutex_unlock(&fs_info->volume_mutex);





	if (!ret)

	if (!ret)

		btrfs_info(fs_info, "disk deleted %s", vol_args->name);

		btrfs_info(fs_info, "disk deleted %s", vol_args->name);

fs/btrfs/volumes.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1842,6 +1842,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path, 
	u64 num_devices;

	u64 num_devices;

	int ret = 0;

	int ret = 0;





	mutex_lock(&fs_info->volume_mutex);

	mutex_lock(&uuid_mutex);

	mutex_lock(&uuid_mutex);





	num_devices = fs_info->fs_devices->num_devices;

	num_devices = fs_info->fs_devices->num_devices;
@@ -1956,6 +1957,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path, 




out:

out:

	mutex_unlock(&uuid_mutex);

	mutex_unlock(&uuid_mutex);

	mutex_unlock(&fs_info->volume_mutex);

	return ret;

	return ret;





error_undo:

error_undo: