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

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: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent be2cf92e

fs/btrfs/disk-io.c

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

fs/btrfs/sysfs.c

+9 −12
Original line number Diff line number Diff line
@@ -995,18 +995,6 @@ int btrfs_sysfs_rm_device_link(struct btrfs_fs_devices *fs_devices, 
	return 0;

}



int btrfs_sysfs_add_devices_kobj(struct btrfs_fs_devices *fs_devs)

{

	if (!fs_devs->devices_kobj)

		fs_devs->devices_kobj = kobject_create_and_add("devices",

							&fs_devs->fsid_kobj);



	if (!fs_devs->devices_kobj)

		return -ENOMEM;



	return 0;

}



int btrfs_sysfs_add_device_link(struct btrfs_fs_devices *fs_devices,

				struct btrfs_device *one_device)

{
@@ -1083,6 +1071,15 @@ int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs) 
		return error;

	}



	fs_devs->devices_kobj = kobject_create_and_add("devices",

						       &fs_devs->fsid_kobj);

	if (!fs_devs->devices_kobj) {

		btrfs_err(fs_devs->fs_info,

			  "failed to init sysfs device interface");

		kobject_put(&fs_devs->fsid_kobj);

		return -ENOMEM;

	}



	return 0;

}

fs/btrfs/sysfs.h

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ int btrfs_sysfs_add_device_link(struct btrfs_fs_devices *fs_devices, 
int btrfs_sysfs_rm_device_link(struct btrfs_fs_devices *fs_devices,

                struct btrfs_device *one_device);

int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs);

int btrfs_sysfs_add_devices_kobj(struct btrfs_fs_devices *fs_devs);

void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs);

void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices,

				    const u8 *fsid);

CRA Git | Maintained and supported by SUSTech CRA and CCSE