Commit b882327a authored by David Sterba's avatar David Sterba
Browse files

btrfs: factor out sysfs code for creating space infos 



Move creation of data/metadata/system space info directories to sysfs.c.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 536ea45c

fs/btrfs/space-info.c

+2 −23
Original line number Diff line number Diff line
@@ -34,23 +34,6 @@ void btrfs_clear_space_info_full(struct btrfs_fs_info *info) 
	rcu_read_unlock();

}



static const char *alloc_name(u64 flags)

{

	switch (flags) {

	case BTRFS_BLOCK_GROUP_METADATA|BTRFS_BLOCK_GROUP_DATA:

		return "mixed";

	case BTRFS_BLOCK_GROUP_METADATA:

		return "metadata";

	case BTRFS_BLOCK_GROUP_DATA:

		return "data";

	case BTRFS_BLOCK_GROUP_SYSTEM:

		return "system";

	default:

		WARN_ON(1);

		return "invalid-combination";

	};

}



static int create_space_info(struct btrfs_fs_info *info, u64 flags)

{
@@ -80,13 +63,9 @@ static int create_space_info(struct btrfs_fs_info *info, u64 flags) 
	INIT_LIST_HEAD(&space_info->tickets);

	INIT_LIST_HEAD(&space_info->priority_tickets);



	ret = kobject_init_and_add(&space_info->kobj, &space_info_ktype,

				    info->space_info_kobj, "%s",

				    alloc_name(space_info->flags));

	if (ret) {

		kobject_put(&space_info->kobj);

	ret = btrfs_sysfs_add_space_info_type(info, space_info);

	if (ret)

		return ret;

	}



	list_add_rcu(&space_info->list, &info->space_info);

	if (flags & BTRFS_BLOCK_GROUP_DATA)

fs/btrfs/sysfs.c

+37 −0
Original line number Diff line number Diff line
@@ -795,6 +795,43 @@ void btrfs_sysfs_add_block_group_type(struct btrfs_block_group_cache *cache) 
	space_info->block_group_kobjs[index] = &rkobj->kobj;

}



static const char *alloc_name(u64 flags)

{

	switch (flags) {

	case BTRFS_BLOCK_GROUP_METADATA | BTRFS_BLOCK_GROUP_DATA:

		return "mixed";

	case BTRFS_BLOCK_GROUP_METADATA:

		return "metadata";

	case BTRFS_BLOCK_GROUP_DATA:

		return "data";

	case BTRFS_BLOCK_GROUP_SYSTEM:

		return "system";

	default:

		WARN_ON(1);

		return "invalid-combination";

	};

}



/*

 * Create a sysfs entry for a space info type at path

 * /sys/fs/btrfs/UUID/allocation/TYPE

 */

int btrfs_sysfs_add_space_info_type(struct btrfs_fs_info *fs_info,

				    struct btrfs_space_info *space_info)

{

	int ret;



	ret = kobject_init_and_add(&space_info->kobj, &space_info_ktype,

				   fs_info->space_info_kobj, "%s",

				   alloc_name(space_info->flags));

	if (ret) {

		kobject_put(&space_info->kobj);

		return ret;

	}



	return 0;

}



/* when one_device is NULL, it removes all device links */



int btrfs_sysfs_rm_device_link(struct btrfs_fs_devices *fs_devices,

fs/btrfs/sysfs.h

+2 −0
Original line number Diff line number Diff line
@@ -96,5 +96,7 @@ void __cold btrfs_exit_sysfs(void); 
int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info);

void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info);

void btrfs_sysfs_add_block_group_type(struct btrfs_block_group_cache *cache);

int btrfs_sysfs_add_space_info_type(struct btrfs_fs_info *fs_info,

				    struct btrfs_space_info *space_info);



#endif