Commit 5f622417 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Jens Axboe

block: make kobj_type structures constant

Since commit ee6d3dd4 ("driver core: make kobj_type constant.")
the driver core allows the usage of const struct kobj_type.

Take advantage of this to constify the structure definitions to prevent
modification at runtime.
Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Link: https://lore.kernel.org/r/20230208-kobj_type-block-v1-1-0b3eafd7d983@weissschuh.netSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 23f3e327
...@@ -116,7 +116,7 @@ static void blk_crypto_release(struct kobject *kobj) ...@@ -116,7 +116,7 @@ static void blk_crypto_release(struct kobject *kobj)
kfree(container_of(kobj, struct blk_crypto_kobj, kobj)); kfree(container_of(kobj, struct blk_crypto_kobj, kobj));
} }
static struct kobj_type blk_crypto_ktype = { static const struct kobj_type blk_crypto_ktype = {
.default_groups = blk_crypto_attr_groups, .default_groups = blk_crypto_attr_groups,
.sysfs_ops = &blk_crypto_attr_ops, .sysfs_ops = &blk_crypto_attr_ops,
.release = blk_crypto_release, .release = blk_crypto_release,
......
...@@ -75,7 +75,7 @@ static void blk_ia_range_sysfs_nop_release(struct kobject *kobj) ...@@ -75,7 +75,7 @@ static void blk_ia_range_sysfs_nop_release(struct kobject *kobj)
{ {
} }
static struct kobj_type blk_ia_range_ktype = { static const struct kobj_type blk_ia_range_ktype = {
.sysfs_ops = &blk_ia_range_sysfs_ops, .sysfs_ops = &blk_ia_range_sysfs_ops,
.default_groups = blk_ia_range_groups, .default_groups = blk_ia_range_groups,
.release = blk_ia_range_sysfs_nop_release, .release = blk_ia_range_sysfs_nop_release,
...@@ -94,7 +94,7 @@ static void blk_ia_ranges_sysfs_release(struct kobject *kobj) ...@@ -94,7 +94,7 @@ static void blk_ia_ranges_sysfs_release(struct kobject *kobj)
kfree(iars); kfree(iars);
} }
static struct kobj_type blk_ia_ranges_ktype = { static const struct kobj_type blk_ia_ranges_ktype = {
.release = blk_ia_ranges_sysfs_release, .release = blk_ia_ranges_sysfs_release,
}; };
......
...@@ -356,7 +356,7 @@ static const struct sysfs_ops integrity_ops = { ...@@ -356,7 +356,7 @@ static const struct sysfs_ops integrity_ops = {
.store = &integrity_attr_store, .store = &integrity_attr_store,
}; };
static struct kobj_type integrity_ktype = { static const struct kobj_type integrity_ktype = {
.default_groups = integrity_groups, .default_groups = integrity_groups,
.sysfs_ops = &integrity_ops, .sysfs_ops = &integrity_ops,
}; };
......
...@@ -129,15 +129,15 @@ static const struct sysfs_ops blk_mq_hw_sysfs_ops = { ...@@ -129,15 +129,15 @@ static const struct sysfs_ops blk_mq_hw_sysfs_ops = {
.show = blk_mq_hw_sysfs_show, .show = blk_mq_hw_sysfs_show,
}; };
static struct kobj_type blk_mq_ktype = { static const struct kobj_type blk_mq_ktype = {
.release = blk_mq_sysfs_release, .release = blk_mq_sysfs_release,
}; };
static struct kobj_type blk_mq_ctx_ktype = { static const struct kobj_type blk_mq_ctx_ktype = {
.release = blk_mq_ctx_sysfs_release, .release = blk_mq_ctx_sysfs_release,
}; };
static struct kobj_type blk_mq_hw_ktype = { static const struct kobj_type blk_mq_hw_ktype = {
.sysfs_ops = &blk_mq_hw_sysfs_ops, .sysfs_ops = &blk_mq_hw_sysfs_ops,
.default_groups = default_hw_ctx_groups, .default_groups = default_hw_ctx_groups,
.release = blk_mq_hw_sysfs_release, .release = blk_mq_hw_sysfs_release,
......
...@@ -765,7 +765,7 @@ static void blk_queue_release(struct kobject *kobj) ...@@ -765,7 +765,7 @@ static void blk_queue_release(struct kobject *kobj)
/* nothing to do here, all data is associated with the parent gendisk */ /* nothing to do here, all data is associated with the parent gendisk */
} }
static struct kobj_type blk_queue_ktype = { static const struct kobj_type blk_queue_ktype = {
.default_groups = blk_queue_attr_groups, .default_groups = blk_queue_attr_groups,
.sysfs_ops = &queue_sysfs_ops, .sysfs_ops = &queue_sysfs_ops,
.release = blk_queue_release, .release = blk_queue_release,
......
...@@ -126,7 +126,7 @@ static struct elevator_type *elevator_find_get(struct request_queue *q, ...@@ -126,7 +126,7 @@ static struct elevator_type *elevator_find_get(struct request_queue *q,
return e; return e;
} }
static struct kobj_type elv_ktype; static const struct kobj_type elv_ktype;
struct elevator_queue *elevator_alloc(struct request_queue *q, struct elevator_queue *elevator_alloc(struct request_queue *q,
struct elevator_type *e) struct elevator_type *e)
...@@ -455,7 +455,7 @@ static const struct sysfs_ops elv_sysfs_ops = { ...@@ -455,7 +455,7 @@ static const struct sysfs_ops elv_sysfs_ops = {
.store = elv_attr_store, .store = elv_attr_store,
}; };
static struct kobj_type elv_ktype = { static const struct kobj_type elv_ktype = {
.sysfs_ops = &elv_sysfs_ops, .sysfs_ops = &elv_sysfs_ops,
.release = elevator_release, .release = elevator_release,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment