Skip to contentSkip to conversation

block/rnbd-clt-sysfs: use default_groups in kobj_type

PATCH Applied Greg Kroah-Hartman 3 participants 3 messages Jan 4, 2022 – Jan 5, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 block/rnbd-clt-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 rnbd controller 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/block/rnbd/rnbd-clt-sysfs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/block/rnbd/rnbd-clt-sysfs.c +2 -1
index 44e45af00e83..2be5d87a3ca6 100644
@@ -452,6 +452,7 @@ static struct attribute *rnbd_dev_attrs[] = {
 	&rnbd_clt_nr_poll_queues.attr,
 	NULL,
 };
+ATTRIBUTE_GROUPS(rnbd_dev);
 
 void rnbd_clt_remove_dev_symlink(struct rnbd_clt_dev *dev)
 {
@@ -474,7 +475,7 @@ void rnbd_clt_remove_dev_symlink(struct rnbd_clt_dev *dev)
 
 static struct kobj_type rnbd_dev_ktype = {
 	.sysfs_ops      = &kobj_sysfs_ops,
-	.default_attrs  = rnbd_dev_attrs,
+	.default_groups = rnbd_dev_groups,
 };
 
 static int rnbd_clt_add_dev_kobj(struct rnbd_clt_dev *dev)
Signature · 1 line
2.34.1
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Greg Kroah-Hartman

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 rnbd controller 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.

Quoted 5 lines

Thanks!

Quoted 28 lines
---
 drivers/block/rnbd/rnbd-clt-sysfs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/block/rnbd/rnbd-clt-sysfs.c +2 -2
index 44e45af00e83..2be5d87a3ca6 100644
@@ -452,6 +452,7 @@ static struct attribute *rnbd_dev_attrs[] = {
        &rnbd_clt_nr_poll_queues.attr,
        NULL,
 };
+ATTRIBUTE_GROUPS(rnbd_dev);
 
 void rnbd_clt_remove_dev_symlink(struct rnbd_clt_dev *dev)
 {
@@ -474,7 +475,7 @@ void rnbd_clt_remove_dev_symlink(struct rnbd_clt_dev *dev)
 
 static struct kobj_type rnbd_dev_ktype = {
        .sysfs_ops      = &kobj_sysfs_ops,
-       .default_attrs  = rnbd_dev_attrs,
+       .default_groups = rnbd_dev_groups,
 };
 
 static int rnbd_clt_add_dev_kobj(struct rnbd_clt_dev *dev)
--

2.34.1

maintainer Applied
#2 lore raw
In reply to Greg Kroah-Hartman
Quoted 8 lines · Greg Kroah-Hartman

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 rnbd controller 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.

[...]

Applied, thanks!

[1/1] block/rnbd-clt-sysfs: use default_groups in kobj_type

      commit: 050f461e28c5d13f327353d660ffad2603ce7ac1

Best regards,

Signature · 1 line
Jens Axboe