Commit 1daa8e25 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-make-kobj_type-structures-constant' 

Thomas Weißschuh says:

====================
net: 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.
====================

Link: https://lore.kernel.org/r/20230211-kobj_type-net-v2-0-013b59e59bf3@weissschuh.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 56193cf9 b2793517

net/bridge/br_if.c

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static void brport_get_ownership(const struct kobject *kobj, kuid_t *uid, kgid_t 
	net_ns_get_ownership(dev_net(p->dev), uid, gid);

}



static struct kobj_type brport_ktype = {

static const struct kobj_type brport_ktype = {

#ifdef CONFIG_SYSFS

	.sysfs_ops = &brport_sysfs_ops,

#endif

net/core/net-sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -1052,7 +1052,7 @@ static void rx_queue_get_ownership(const struct kobject *kobj, 
	net_ns_get_ownership(net, uid, gid);

}



static struct kobj_type rx_queue_ktype __ro_after_init = {

static const struct kobj_type rx_queue_ktype = {

	.sysfs_ops = &rx_queue_sysfs_ops,

	.release = rx_queue_release,

	.default_groups = rx_queue_default_groups,
@@ -1662,7 +1662,7 @@ static void netdev_queue_get_ownership(const struct kobject *kobj, 
	net_ns_get_ownership(net, uid, gid);

}



static struct kobj_type netdev_queue_ktype __ro_after_init = {

static const struct kobj_type netdev_queue_ktype = {

	.sysfs_ops = &netdev_queue_sysfs_ops,

	.release = netdev_queue_release,

	.default_groups = netdev_queue_default_groups,