mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: use device_list_mutex when removing stale devices

Browse source 
btrfs_free_stale_devices() finds a stale (not opened) device matching
path in the fs_uuid list. We are already under uuid_mutex so when we
check for each fs_devices, hold the device_list_mutex too.

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-05-29 17:23:20 +08:00 committed by David Sterba
parent fa6d2ae540
commit 7bcb8164ad
1 changed files with 15 additions and 10 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

25
fs/btrfs/volumes.c
View file

@ -637,8 +637,11 @@ static void btrfs_free_stale_devices(const char *path,
struct btrfs_device *device, *tmp_device; struct btrfs_device *device, *tmp_device;
list_for_each_entry_safe(fs_devices, tmp_fs_devices, &fs_uuids, fs_list) { list_for_each_entry_safe(fs_devices, tmp_fs_devices, &fs_uuids, fs_list) {
if (fs_devices->opened) mutex_lock(&fs_devices->device_list_mutex);
if (fs_devices->opened) {
mutex_unlock(&fs_devices->device_list_mutex);
continue; continue;
}
list_for_each_entry_safe(device, tmp_device, list_for_each_entry_safe(device, tmp_device,
&fs_devices->devices, dev_list) { &fs_devices->devices, dev_list) {
@ -658,16 +661,18 @@ static void btrfs_free_stale_devices(const char *path,
continue; continue;
/* delete the stale device */ /* delete the stale device */
if (fs_devices->num_devices == 1) { fs_devices->num_devices--;
btrfs_sysfs_remove_fsid(fs_devices); list_del(&device->dev_list);
list_del(&fs_devices->fs_list); btrfs_free_device(device);
free_fs_devices(fs_devices);
if (fs_devices->num_devices == 0)
break; break;
} else { }
fs_devices->num_devices--; mutex_unlock(&fs_devices->device_list_mutex);
list_del(&device->dev_list); if (fs_devices->num_devices == 0) {
btrfs_free_device(device); btrfs_sysfs_remove_fsid(fs_devices);
} list_del(&fs_devices->fs_list);
free_fs_devices(fs_devices);
} }
} }
} }