diff options
| author | Anand Jain <anand.jain@oracle.com> | 2018-04-12 04:29:31 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-05-28 18:23:13 +0200 |
| commit | 41a52a0f1bdcb3a17e2b384d6b6368a9590f9a58 (patch) | |
| tree | d93d31bf1d204d6b6bbd2b0eccee38f7bb13e8ed /fs/btrfs/volumes.c | |
| parent | btrfs: reduce uuid_mutex critical section while scanning devices (diff) | |
| download | linux-41a52a0f1bdcb3a17e2b384d6b6368a9590f9a58.tar.xz linux-41a52a0f1bdcb3a17e2b384d6b6368a9590f9a58.zip | |
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>
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index c1d09da40d73..a382d53c560a 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -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. */ + /* + * 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; mutex_lock(&fs_devices->device_list_mutex); list_del_rcu(&device->dev_list); - device->fs_devices->num_devices--; - device->fs_devices->total_devices--; + cur_devices->num_devices--; + cur_devices->total_devices--; 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); if (device->bdev) { - device->fs_devices->open_devices--; + cur_devices->open_devices--; /* remove sysfs entry */ btrfs_sysfs_rm_device_link(fs_devices, device); } |