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

Commit 7c7e3014 authored by Kimberly Brown's avatar Kimberly Brown Committed by Greg Kroah-Hartman
Browse files

btrfs: sysfs: Replace default_attrs in ktypes with groups 



The kobj_type default_attrs field is being replaced by the
default_groups field. Replace the default_attrs fields in
btrfs_raid_ktype and space_info_ktype with default_groups.

Change "raid_attributes" to "raid_attrs", and use the ATTRIBUTE_GROUPS
macro to create raid_groups and space_info_groups.

Signed-off-by: default avatarKimberly Brown <kimbrownkd@gmail.com>
Acked-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d2527682

fs/btrfs/sysfs.c

+5 −3
Original line number Diff line number Diff line
@@ -303,11 +303,12 @@ static ssize_t raid_bytes_show(struct kobject *kobj, 
	return snprintf(buf, PAGE_SIZE, "%llu\n", val);

}



static struct attribute *raid_attributes[] = {

static struct attribute *raid_attrs[] = {

	BTRFS_ATTR_PTR(raid, total_bytes),

	BTRFS_ATTR_PTR(raid, used_bytes),

	NULL

};

ATTRIBUTE_GROUPS(raid);



static void release_raid_kobj(struct kobject *kobj)

{
@@ -317,7 +318,7 @@ static void release_raid_kobj(struct kobject *kobj) 
struct kobj_type btrfs_raid_ktype = {

	.sysfs_ops = &kobj_sysfs_ops,

	.release = release_raid_kobj,

	.default_attrs = raid_attributes,

	.default_groups = raid_groups,

};



#define SPACE_INFO_ATTR(field)						\
@@ -364,6 +365,7 @@ static struct attribute *space_info_attrs[] = { 
	BTRFS_ATTR_PTR(space_info, total_bytes_pinned),

	NULL,

};

ATTRIBUTE_GROUPS(space_info);



static void space_info_release(struct kobject *kobj)

{
@@ -375,7 +377,7 @@ static void space_info_release(struct kobject *kobj) 
struct kobj_type space_info_ktype = {

	.sysfs_ops = &kobj_sysfs_ops,

	.release = space_info_release,

	.default_attrs = space_info_attrs,

	.default_groups = space_info_groups,

};



static const struct attribute *allocation_attrs[] = {