Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 23:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Btrfs: sysfs: reorder the kobject creations

Browse Source 
As of now the order in which the kobjects are created
at btrfs_sysfs_add_one() is..
 fsid
 features
 unknown features (dynamic features)
 devices.

Since we would move fsid and device kobject to fs_devices
from fs_info structure, this patch will reorder in which
the kobjects are created as below.
 fsid
 devices
 features
 unknown features (dynamic features)

And hence the btrfs_sysfs_remove_one() will follow the same
in reverse order. and the device kobject destroy now can
be moved into the function __btrfs_sysfs_remove_one()

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:24 +08:00 committed by David Sterba
parent 4d435731f9
commit aaf1330516
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/btrfs/sysfs.c
View File

@ -510,6 +510,13 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
static void __btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info) static void __btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)
{ {
if (fs_info->device_dir_kobj) {
btrfs_kobj_rm_device(fs_info, NULL);
kobject_del(fs_info->device_dir_kobj);
kobject_put(fs_info->device_dir_kobj);
fs_info->device_dir_kobj = NULL;
}
kobject_del(&fs_info->super_kobj); kobject_del(&fs_info->super_kobj);
kobject_put(&fs_info->super_kobj); kobject_put(&fs_info->super_kobj);
wait_for_completion(&fs_info->kobj_unregister); wait_for_completion(&fs_info->kobj_unregister);
@ -522,12 +529,6 @@ void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)
kobject_del(fs_info->space_info_kobj); kobject_del(fs_info->space_info_kobj);
kobject_put(fs_info->space_info_kobj); kobject_put(fs_info->space_info_kobj);
} }
if (fs_info->device_dir_kobj) {
btrfs_kobj_rm_device(fs_info, NULL);
kobject_del(fs_info->device_dir_kobj);
kobject_put(fs_info->device_dir_kobj);
fs_info->device_dir_kobj = NULL;
}
addrm_unknown_feature_attrs(fs_info, false); addrm_unknown_feature_attrs(fs_info, false);
sysfs_remove_group(&fs_info->super_kobj, &btrfs_feature_attr_group); sysfs_remove_group(&fs_info->super_kobj, &btrfs_feature_attr_group);
__btrfs_sysfs_remove_one(fs_info); __btrfs_sysfs_remove_one(fs_info);
@ -700,6 +701,12 @@ int btrfs_sysfs_add_one(struct btrfs_fs_info *fs_info)
if (error) if (error)
return error; return error;
error = btrfs_kobj_add_device(fs_info, NULL);
if (error) {
__btrfs_sysfs_remove_one(fs_info);
return error;
}
error = sysfs_create_group(&fs_info->super_kobj, error = sysfs_create_group(&fs_info->super_kobj,
&btrfs_feature_attr_group); &btrfs_feature_attr_group);
if (error) { if (error) {
@ -711,10 +718,6 @@ int btrfs_sysfs_add_one(struct btrfs_fs_info *fs_info)
if (error) if (error)
goto failure; goto failure;
error = btrfs_kobj_add_device(fs_info, NULL);
if (error)
goto failure;
fs_info->space_info_kobj = kobject_create_and_add("allocation", fs_info->space_info_kobj = kobject_create_and_add("allocation",
&fs_info->super_kobj); &fs_info->super_kobj);
if (!fs_info->space_info_kobj) { if (!fs_info->space_info_kobj) {