Skip to contentSkip to conversation

block: fix attribute_group lost if set before add_disk

PATCH In review Sun Feng 2 participants 2 messages Jun 10, 2022 Block layer

lore
Share & tools
lore

Sun Feng

author
#0 lore raw

PATCH 1/1 block: fix attribute_group lost if set before add_disk

after commit 52b85909f85d("block: fold register_disk into device_add_disk") when set attribute_group with following code:

  disk_to_dev(disk)->groups = attr_groups;
  err = add_disk(disk);

disk_to_dev(disk)->groups will set to NULL in device_add_disk,

static inline int __must_check add_disk(struct gendisk *disk)

  {
       	return device_add_disk(NULL, disk, NULL);
  }
  int __must_check device_add_disk(struct device *parent, ...
                                 const struct attribute_group **groups)
  {
	…
	ddev->groups = groups

and it will lose attribute group set.

---
 block/genhd.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
block/genhd.c +4 -1
index 27205ae..6b76f67 100644
@@ -459,7 +459,10 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
 	dev_set_uevent_suppress(ddev, 1);
 
 	ddev->parent = parent;
-	ddev->groups = groups;
+	if (groups) {
+		WARN_ON(ddev->groups);
+		ddev->groups = groups;
+	}
 	dev_set_name(ddev, "%s", disk->disk_name);
 	if (!(disk->flags & GENHD_FL_HIDDEN))
 		ddev->devt = MKDEV(disk->major, disk->first_minor);
Signature · 1 line
2.7.4
#1 lore raw
Quoted 18 lines · Sun Feng

after commit 52b85909f85d("block: fold register_disk into device_add_disk") when set attribute_group with following code:

  disk_to_dev(disk)->groups = attr_groups;
  err = add_disk(disk);

disk_to_dev(disk)->groups will set to NULL in device_add_disk,

static inline int __must_check add_disk(struct gendisk *disk)

  {
       	return device_add_disk(NULL, disk, NULL);
  }
  int __must_check device_add_disk(struct device *parent, ...
                                 const struct attribute_group **groups)
  {
	…
	ddev->groups = groups
Quoted 1 line

and it will lose attribute group set.

Well, your are not supposed to set the attribute group yourself, but instead pass it to device_add_disk.