dm sysfs: use default_groups in kobj_type
PATCH 1/1 dm sysfs: use default_groups in kobj_type
There are currently 2 ways to create a set of sysfs files for a kobj_type, through the default_attrs field, and the default_groups field. Move the dm sysfs code to use default_groups field which has been the preferred way since aa30f47cf666 ("kobject: Add support for default attribute groups to kobj_type") so that we can soon get rid of the obsolete default_attrs field.
--- drivers/md/dm-sysfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/md/dm-sysfs.c +2 -1
@@ -112,6 +112,7 @@ static struct attribute *dm_attrs[] = { &dm_attr_rq_based_seq_io_merge_deadline.attr,NULL , }; +ATTRIBUTE_GROUPS (dm);static const struct sysfs_ops dm_sysfs_ops = { .show = dm_attr_show,
@@ -120,7 +121,7 @@ static const struct sysfs_ops dm_sysfs_ops = {static struct kobj_type dm_ktype = { .sysfs_ops = &dm_sysfs_ops, - .default_attrs = dm_attrs, + .default_groups = dm_groups, .release = dm_kobject_release, };
Signature · 1 line
2.34.1
Quoted 20 lines · Greg Kroah-Hartman
There are currently 2 ways to create a set of sysfs files for a
kobj_type, through thedefault_attrsfield, and thedefault_groupsfield. Move the dm sysfs code to usedefault_groupsfield which has been the preferred way sinceaa30f47cf666("kobject: Add support for default attribute groups tokobj_type") so that we can soon get rid of the obsoletedefault_attrsfield.Cc Alasdair Kergon <[email protected]>Cc Mike Snitzer <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/md/dm-sysfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/md/dm-sysfs.c +0
-0
drivers/md/dm-sysfs.c static struct attribute *dm_attrs[] = { · line 115
Quoted 4 lines
drivers/md/dm-sysfs.c +1
-0@@ -112,6 +112,7 @@ static struct attribute *dm_attrs[] = { &dm_attr_rq_based_seq_io_merge_deadline.attr,NULL , }; +ATTRIBUTE_GROUPS (dm);
Bit strange to pass "dm" but then have ATTRIBUTE_GROUPS assume dm_attrs defined. Feels like it'll invite janitors sending patches, that they never compile, to remove dm_attrs.
Quoted 15 lines
drivers/md/dm-sysfs.c +1
-1static const struct sysfs_ops dm_sysfs_ops = { .show = dm_attr_show,@@ -120,7 +121,7 @@ static const struct sysfs_ops dm_sysfs_ops = {static struct kobj_type dm_ktype = { .sysfs_ops = &dm_sysfs_ops, - .default_attrs = dm_attrs, + .default_groups = dm_groups, .release = dm_kobject_release, };Signature · 1 line
2.34.1
But I've picked this patch up for 5.17. Thanks.
Quoted 18 lines · Mike Snitzer
Quoted 15 lines · Greg Kroah-Hartman
There are currently 2 ways to create a set of sysfs files for a
kobj_type, through thedefault_attrsfield, and thedefault_groupsfield. Move the dm sysfs code to usedefault_groupsfield which has been the preferred way sinceaa30f47cf666("kobject: Add support for default attribute groups tokobj_type") so that we can soon get rid of the obsoletedefault_attrsfield.Cc Alasdair Kergon <[email protected]>Cc Mike Snitzer <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/md/dm-sysfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 13 lines
drivers/md/dm-sysfs.c static struct attribute *dm_attrs[] = { · line 115
Quoted 9 lines
drivers/md/dm-sysfs.c +1
-0@@ -112,6 +112,7 @@ static struct attribute *dm_attrs[] = { &dm_attr_rq_based_seq_io_merge_deadline.attr,NULL , }; +ATTRIBUTE_GROUPS (dm);Bit strange to pass "dm" but then have
ATTRIBUTE_GROUPSassumedm_attrsdefined. Feels like it'll invite janitors sending patches, that they never compile, to removedm_attrs.
0-day would instantly catch that :)
That's the way the ATTRIBUTE_GROUPS() macro works. It's tricky, yes, and I don't like it all that much, but couldn't come up with a better way at the time. It saves lots and lots of boiler-plate code from having to be typed all the time.
thanks,
greg k-h
Quoted 33 lines · Greg Kroah-Hartman
Quoted 18 lines · Mike Snitzer
Quoted 15 lines · Greg Kroah-Hartman
There are currently 2 ways to create a set of sysfs files for a
kobj_type, through thedefault_attrsfield, and thedefault_groupsfield. Move the dm sysfs code to usedefault_groupsfield which has been the preferred way sinceaa30f47cf666("kobject: Add support for default attribute groups tokobj_type") so that we can soon get rid of the obsoletedefault_attrsfield.Cc Alasdair Kergon <[email protected]>Cc Mike Snitzer <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/md/dm-sysfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)Quoted 13 lines
drivers/md/dm-sysfs.c static struct attribute *dm_attrs[] = { · line 115
Quoted 9 lines
drivers/md/dm-sysfs.c +1
-0@@ -112,6 +112,7 @@ static struct attribute *dm_attrs[] = { &dm_attr_rq_based_seq_io_merge_deadline.attr,NULL , }; +ATTRIBUTE_GROUPS (dm);Bit strange to pass "dm" but then have
ATTRIBUTE_GROUPSassumedm_attrsdefined. Feels like it'll invite janitors sending patches, that they never compile, to removedm_attrs.
Quoted 6 lines
0-day would instantly catch that :)
That's the way the
ATTRIBUTE_GROUPS()macro works. It's tricky, yes, and I don't like it all that much, but couldn't come up with a better way at the time. It saves lots and lots of boiler-plate code from having to be typed all the time.
OK, thanks for the insight.
Mike