diff options
| author | Anand Jain <anand.jain@oracle.com> | 2015-03-10 06:38:38 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2015-05-27 12:27:22 +0200 |
| commit | b7c35e81adcd593daca2160b5ba0ec62f71a9303 (patch) | |
| tree | 5ee7c4c04ee26b5df5e698c6982de32fff60fcca /fs/btrfs/sysfs.c | |
| parent | 1d1c1be3720c1f4b621c5f90a4f61bdd856a0aa8 (diff) | |
| download | linux-0-day-b7c35e81adcd593daca2160b5ba0ec62f71a9303.tar.gz linux-0-day-b7c35e81adcd593daca2160b5ba0ec62f71a9303.tar.xz | |
Btrfs: sysfs: separate kobject and attribute creation
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs/sysfs.c')
| -rw-r--r-- | fs/btrfs/sysfs.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c index 06eae456612fe..b35366c88d3dd 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c @@ -556,7 +556,6 @@ void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info) sysfs_remove_group(&fs_info->fs_devices->super_kobj, &btrfs_feature_attr_group); sysfs_remove_files(&fs_info->fs_devices->super_kobj, btrfs_attrs); btrfs_kobj_rm_device(fs_info->fs_devices, NULL); - btrfs_sysfs_remove_fsid(fs_info->fs_devices); } const char * const btrfs_feature_set_names[3] = { @@ -688,10 +687,6 @@ int btrfs_kobj_add_device(struct btrfs_fs_devices *fs_devices, int error = 0; struct btrfs_device *dev; - error = btrfs_sysfs_add_device(fs_devices); - if (error) - return error; - list_for_each_entry(dev, &fs_devices->devices, dev_list) { struct hd_struct *disk; struct kobject *disk_kobj; @@ -747,19 +742,13 @@ int btrfs_sysfs_add_one(struct btrfs_fs_info *fs_info) btrfs_set_fs_info_ptr(fs_info); - error = btrfs_sysfs_add_fsid(fs_devs, NULL); - if (error) - return error; - error = btrfs_kobj_add_device(fs_devs, NULL); - if (error) { - btrfs_sysfs_remove_fsid(fs_devs); + if (error) return error; - } error = sysfs_create_files(super_kobj, btrfs_attrs); if (error) { - btrfs_sysfs_remove_fsid(fs_devs); + btrfs_kobj_rm_device(fs_devs, NULL); return error; } |