korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 05:04:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Btrfs: sysfs: separate kobject and attribute creation

Browse Source 
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
Anand Jain 2015-03-10 06:38:38 +08:00 committed by David Sterba
parent 1d1c1be372
commit b7c35e81ad
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/btrfs/disk-io.c
View File

@ -2873,10 +2873,22 @@ retry_root_backup:
btrfs_close_extra_devices(fs_devices, 1);
ret = btrfs_sysfs_add_fsid(fs_devices, NULL);
if (ret) {
pr_err("BTRFS: failed to init sysfs fsid interface: %d\n", ret);
goto fail_block_groups;
}
ret = btrfs_sysfs_add_device(fs_devices);
if (ret) {
pr_err("BTRFS: failed to init sysfs device interface: %d\n", ret);
goto fail_fsdev_sysfs;
}
ret = btrfs_sysfs_add_one(fs_info);
if (ret) {
pr_err("BTRFS: failed to init sysfs interface: %d\n", ret);
goto fail_block_groups;
goto fail_fsdev_sysfs;
}
ret = btrfs_init_space_info(fs_info);
@ -3054,6 +3066,9 @@ fail_cleaner:
fail_sysfs:
btrfs_sysfs_remove_one(fs_info);
fail_fsdev_sysfs:
btrfs_sysfs_remove_fsid(fs_info->fs_devices);
fail_block_groups:
btrfs_put_block_group_cache(fs_info);
btrfs_free_block_groups(fs_info);
@ -3731,6 +3746,7 @@ void close_ctree(struct btrfs_root *root)
}
btrfs_sysfs_remove_one(fs_info);
btrfs_sysfs_remove_fsid(fs_info->fs_devices);
btrfs_free_fs_roots(fs_info);

15
fs/btrfs/sysfs.c
View File

@ -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);
error = btrfs_kobj_add_device(fs_devs, NULL);
if (error)
return error;
error = btrfs_kobj_add_device(fs_devs, NULL);
if (error) {
btrfs_sysfs_remove_fsid(fs_devs);
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;
}