Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7c35e81 authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

Btrfs: sysfs: separate kobject and attribute creation 



Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
parent 1d1c1be3

fs/btrfs/disk-io.c

+17 −1
Original line number Diff line number Diff line
@@ -2873,10 +2873,22 @@ int open_ctree(struct super_block *sb, 


	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 @@ int open_ctree(struct super_block *sb, 
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);

fs/btrfs/sysfs.c

+2 −13
Original line number Diff line number Diff line
@@ -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;

	}