[PATCH] block: Constify static attribute_group structs

DORMANTno replies

From: Rikard Falkeborn <hidden>
Date: 2021-05-28 22:33:00
Also in: lkml
Subsystem: block layer, the rest · Maintainers: Jens Axboe, Linus Torvalds

Either their address is put in an array of pointers to const attribute
groups structs, or the address is passed to sysfs_create_group() which
accepts a pointer to const struct attribute group. Make them const to
allow the compiler to put them in read-only memory.

Signed-off-by: Rikard Falkeborn <redacted>
---
 block/blk-sysfs.c       | 2 +-
 block/genhd.c           | 2 +-
 block/partitions/core.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index f89e2fc3963b..5c5d21b7d278 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -698,7 +698,7 @@ static umode_t queue_attr_visible(struct kobject *kobj, struct attribute *attr,
 	return attr->mode;
 }
 
-static struct attribute_group queue_attr_group = {
+static const struct attribute_group queue_attr_group = {
 	.attrs = queue_attrs,
 	.is_visible = queue_attr_visible,
 };
diff --git a/block/genhd.c b/block/genhd.c
index 9f8cb7beaad1..0f85687a7c69 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1090,7 +1090,7 @@ static umode_t disk_visible(struct kobject *kobj, struct attribute *a, int n)
 	return a->mode;
 }
 
-static struct attribute_group disk_attr_group = {
+static const struct attribute_group disk_attr_group = {
 	.attrs = disk_attrs,
 	.is_visible = disk_visible,
 };
diff --git a/block/partitions/core.c b/block/partitions/core.c
index dc60ecf46fe6..8c3237f11261 100644
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -246,7 +246,7 @@ static struct attribute *part_attrs[] = {
 	NULL
 };
 
-static struct attribute_group part_attr_group = {
+static const struct attribute_group part_attr_group = {
 	.attrs = part_attrs,
 };
 
-- 
2.31.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help