btrfs_free_stale_devices() finds the stale (not opened) matching
device path in the fs_uuid list. We are already under uuid_mutex
so when we check for each fs_devices, hold the respective
device_list_mutex.
Signed-off-by: Anand Jain <anand.jain@xxxxxxxxxx>
---
fs/btrfs/volumes.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index fd656eb75225..a6a23b0185e5 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -643,8 +643,11 @@ static void btrfs_free_stale_devices(const char *path,
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;
+ }
list_for_each_entry_safe(device, tmp_device,
&fs_devices->devices, dev_list) {
@@ -664,16 +667,18 @@ static void btrfs_free_stale_devices(const char *path,
continue;
/* delete the stale device */
- if (fs_devices->num_devices == 1) {
- btrfs_sysfs_remove_fsid(fs_devices);
- list_del(&fs_devices->fs_list);
- free_fs_devices(fs_devices);
+ fs_devices->num_devices--;
+ list_del(&device->dev_list);
+ btrfs_free_device(device);
+
+ if (fs_devices->num_devices == 0)
break;
- } else {
- fs_devices->num_devices--;
- list_del(&device->dev_list);
- btrfs_free_device(device);
- }
+ }
+ mutex_unlock(&fs_devices->device_list_mutex);
+ if (fs_devices->num_devices == 0) {
+ btrfs_sysfs_remove_fsid(fs_devices);
+ list_del(&fs_devices->fs_list);
+ free_fs_devices(fs_devices);
}
}
}
--
2.7.0
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
