btrfs: sysfs: Replace default_attrs in ktypes with groups
PATCH 1/1 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.
---
This patch depends on a patch in the driver-core tree: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git/commit/?h=driver-core-next&id=aa30f47cf666111f6bbfd15f290a27e8a7b9d854
GregKH can take this patch through the driver-core tree, or this patch can wait a release cycle and go through the subsystem's tree, whichever the subsystem maintainer is more comfortable with.
fs/btrfs/sysfs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
fs/btrfs/sysfs.c +5 -3
@@ -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[] = {
Signature · 1 line
2.17.1
Quoted 8 lines · Kimberly Brown
The
kobj_typedefault_attrsfield is being replaced by thedefault_groupsfield. Replace thedefault_attrsfields inbtrfs_raid_ktypeandspace_info_ktypewithdefault_groups.Change "
raid_attributes" to "raid_attrs", and use theATTRIBUTE_GROUPSmacro to createraid_groupsandspace_info_groups.Signed-off-by Kimberly Brown <[email protected]>
Quoted 7 lines
---
This patch depends on a patch in the driver-core tree: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git/commit/?h=driver-core-next&id=aa30f47cf666111f6bbfd15f290a27e8a7b9d854
GregKH can take this patch through the driver-core tree, or this patch can wait a release cycle and go through the subsystem's tree, whichever the subsystem maintainer is more comfortable with.
Please take it through the driver-core tree, thanks.