btrfs: sysfs, merge btrfs_sysfs_add devices_kobj and fsid

Merge btrfs_sysfs_add_fsid() and btrfs_sysfs_add_devices_kobj() functions
as these two are small and they are called one after the other.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain
2019-11-21 17:33:34 +08:00
committed by David Sterba
parent be2cf92e0a
commit bc036bb335
3 changed files with 9 additions and 20 deletions

View File

@@ -3089,13 +3089,6 @@ int __cold open_ctree(struct super_block *sb,
goto fail_block_groups;
}
ret = btrfs_sysfs_add_devices_kobj(fs_devices);
if (ret) {
btrfs_err(fs_info, "failed to init sysfs device interface: %d",
ret);
goto fail_fsdev_sysfs;
}
ret = btrfs_sysfs_add_mounted(fs_info);
if (ret) {
btrfs_err(fs_info, "failed to init sysfs interface: %d", ret);