|
@@ -492,10 +492,10 @@ static noinline int device_list_add(const char *path,
|
|
|
|
|
|
mutex_lock(&fs_devices->device_list_mutex);
|
|
|
list_add_rcu(&device->dev_list, &fs_devices->devices);
|
|
|
+ fs_devices->num_devices++;
|
|
|
mutex_unlock(&fs_devices->device_list_mutex);
|
|
|
|
|
|
device->fs_devices = fs_devices;
|
|
|
- fs_devices->num_devices++;
|
|
|
} else if (!device->name || strcmp(device->name->str, path)) {
|
|
|
name = rcu_string_strdup(path, GFP_NOFS);
|
|
|
if (!name)
|
|
@@ -1852,7 +1852,6 @@ static int btrfs_prepare_sprout(struct btrfs_root *root)
|
|
|
mutex_lock(&root->fs_info->fs_devices->device_list_mutex);
|
|
|
list_splice_init_rcu(&fs_devices->devices, &seed_devices->devices,
|
|
|
synchronize_rcu);
|
|
|
- mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
|
|
|
|
|
|
list_splice_init(&fs_devices->alloc_list, &seed_devices->alloc_list);
|
|
|
list_for_each_entry(device, &seed_devices->devices, dev_list) {
|
|
@@ -1868,6 +1867,8 @@ static int btrfs_prepare_sprout(struct btrfs_root *root)
|
|
|
generate_random_uuid(fs_devices->fsid);
|
|
|
memcpy(root->fs_info->fsid, fs_devices->fsid, BTRFS_FSID_SIZE);
|
|
|
memcpy(disk_super->fsid, fs_devices->fsid, BTRFS_FSID_SIZE);
|
|
|
+ mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
|
|
|
+
|
|
|
super_flags = btrfs_super_flags(disk_super) &
|
|
|
~BTRFS_SUPER_FLAG_SEEDING;
|
|
|
btrfs_set_super_flags(disk_super, super_flags);
|