|
@@ -625,14 +625,17 @@ int btrfs_kobj_rm_device(struct btrfs_fs_info *fs_info,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int btrfs_kobj_add_device(struct btrfs_fs_info *fs_info)
|
|
|
+int btrfs_kobj_add_device(struct btrfs_fs_info *fs_info,
|
|
|
+ struct btrfs_device *one_device)
|
|
|
{
|
|
|
int error = 0;
|
|
|
struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
|
|
|
struct btrfs_device *dev;
|
|
|
|
|
|
- fs_info->device_dir_kobj = kobject_create_and_add("devices",
|
|
|
+ if (!fs_info->device_dir_kobj)
|
|
|
+ fs_info->device_dir_kobj = kobject_create_and_add("devices",
|
|
|
&fs_info->super_kobj);
|
|
|
+
|
|
|
if (!fs_info->device_dir_kobj)
|
|
|
return -ENOMEM;
|
|
|
|
|
@@ -643,6 +646,9 @@ static int btrfs_kobj_add_device(struct btrfs_fs_info *fs_info)
|
|
|
if (!dev->bdev)
|
|
|
continue;
|
|
|
|
|
|
+ if (one_device && one_device != dev)
|
|
|
+ continue;
|
|
|
+
|
|
|
disk = dev->bdev->bd_part;
|
|
|
disk_kobj = &part_to_dev(disk)->kobj;
|
|
|
|
|
@@ -686,7 +692,7 @@ int btrfs_sysfs_add_one(struct btrfs_fs_info *fs_info)
|
|
|
if (error)
|
|
|
goto failure;
|
|
|
|
|
|
- error = btrfs_kobj_add_device(fs_info);
|
|
|
+ error = btrfs_kobj_add_device(fs_info, NULL);
|
|
|
if (error)
|
|
|
goto failure;
|
|
|
|