UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: use existing cur_devices, cleanup btrfs_rm_device 

Instead of de-referencing the device->fs_devices use cur_devices
which points to the same fs_devices and does not change.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain 2018-04-12 10:29:31 +08:00 committed by David Sterba
parent b6ed73bcb1
commit 41a52a0f1b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/btrfs/volumes.c
View File

@ -2015,20 +2015,25 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path,
* (super_copy) should hold the device list mutex. * (super_copy) should hold the device list mutex.
*/ */
/*
* In normal cases the cur_devices == fs_devices. But in case
* of deleting a seed device, the cur_devices should point to
* its own fs_devices listed under the fs_devices->seed.
*/
cur_devices = device->fs_devices; cur_devices = device->fs_devices;
mutex_lock(&fs_devices->device_list_mutex); mutex_lock(&fs_devices->device_list_mutex);
list_del_rcu(&device->dev_list); list_del_rcu(&device->dev_list);
device->fs_devices->num_devices--; cur_devices->num_devices--;
device->fs_devices->total_devices--; cur_devices->total_devices--;
if (test_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state)) if (test_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state))
device->fs_devices->missing_devices--; cur_devices->missing_devices--;
btrfs_assign_next_active_device(fs_info, device, NULL); btrfs_assign_next_active_device(fs_info, device, NULL);
if (device->bdev) { if (device->bdev) {
device->fs_devices->open_devices--; cur_devices->open_devices--;
/* remove sysfs entry */ /* remove sysfs entry */
btrfs_sysfs_rm_device_link(fs_devices, device); btrfs_sysfs_rm_device_link(fs_devices, device);
} }