| Message ID | 20221121094649.1556002-1-gregkh@linuxfoundation.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/5] kobject: make kobject_get_ownership() take a constant kobject * | expand |
On 21/11/2022 11:46, Greg Kroah-Hartman wrote: > The call, kobject_get_ownership(), does not modify the kobject passed > into it, so make it const. This propagates down into the kobj_type > function callbacks so make the kobject passed into them also const, > ensuring that nothing in the kobject is being changed here. > > This helps make it more obvious what calls and callbacks do, and do not, > modify structures passed to them. > > Cc: "Rafael J. Wysocki" <rafael@kernel.org> > Cc: Trond Myklebust <trond.myklebust@hammerspace.com> > Cc: Anna Schumaker <anna@kernel.org> > Cc: Roopa Prabhu <roopa@nvidia.com> > Cc: Nikolay Aleksandrov <razor@blackwall.org> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Eric Dumazet <edumazet@google.com> > Cc: Jakub Kicinski <kuba@kernel.org> > Cc: Paolo Abeni <pabeni@redhat.com> > Cc: Chuck Lever <chuck.lever@oracle.com> > Cc: Jeff Layton <jlayton@kernel.org> > Cc: linux-nfs@vger.kernel.org > Cc: bridge@lists.linux-foundation.org > Cc: netdev@vger.kernel.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > --- > drivers/base/class.c | 2 +- > drivers/base/core.c | 8 ++++---- > fs/nfs/sysfs.c | 4 ++-- > include/linux/kobject.h | 8 ++++---- > lib/kobject.c | 4 ++-- > net/bridge/br_if.c | 2 +- > net/core/net-sysfs.c | 8 ++++---- > net/sunrpc/sysfs.c | 8 ++++---- > 8 files changed, 22 insertions(+), 22 deletions(-) > For the bridge: Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
On Mon, Nov 21, 2022 at 10:47 AM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > > The call, kobject_get_ownership(), does not modify the kobject passed > into it, so make it const. This propagates down into the kobj_type > function callbacks so make the kobject passed into them also const, > ensuring that nothing in the kobject is being changed here. > > This helps make it more obvious what calls and callbacks do, and do not, > modify structures passed to them. > > Cc: "Rafael J. Wysocki" <rafael@kernel.org> > Cc: Trond Myklebust <trond.myklebust@hammerspace.com> > Cc: Anna Schumaker <anna@kernel.org> > Cc: Roopa Prabhu <roopa@nvidia.com> > Cc: Nikolay Aleksandrov <razor@blackwall.org> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Eric Dumazet <edumazet@google.com> > Cc: Jakub Kicinski <kuba@kernel.org> > Cc: Paolo Abeni <pabeni@redhat.com> > Cc: Chuck Lever <chuck.lever@oracle.com> > Cc: Jeff Layton <jlayton@kernel.org> > Cc: linux-nfs@vger.kernel.org > Cc: bridge@lists.linux-foundation.org > Cc: netdev@vger.kernel.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Rafael J. Wysocki <rafael@kernel.org> > --- > drivers/base/class.c | 2 +- > drivers/base/core.c | 8 ++++---- > fs/nfs/sysfs.c | 4 ++-- > include/linux/kobject.h | 8 ++++---- > lib/kobject.c | 4 ++-- > net/bridge/br_if.c | 2 +- > net/core/net-sysfs.c | 8 ++++---- > net/sunrpc/sysfs.c | 8 ++++---- > 8 files changed, 22 insertions(+), 22 deletions(-) > > diff --git a/drivers/base/class.c b/drivers/base/class.c > index 8ceafb7d0203..86ec554cfe60 100644 > --- a/drivers/base/class.c > +++ b/drivers/base/class.c > @@ -62,7 +62,7 @@ static void class_release(struct kobject *kobj) > kfree(cp); > } > > -static const struct kobj_ns_type_operations *class_child_ns_type(struct kobject *kobj) > +static const struct kobj_ns_type_operations *class_child_ns_type(const struct kobject *kobj) > { > struct subsys_private *cp = to_subsys_private(kobj); > struct class *class = cp->class; > diff --git a/drivers/base/core.c b/drivers/base/core.c > index ab01828fe6c1..a79b99ecf4d8 100644 > --- a/drivers/base/core.c > +++ b/drivers/base/core.c > @@ -2335,7 +2335,7 @@ static void device_release(struct kobject *kobj) > kfree(p); > } > > -static const void *device_namespace(struct kobject *kobj) > +static const void *device_namespace(const struct kobject *kobj) > { > const struct device *dev = kobj_to_dev(kobj); > const void *ns = NULL; > @@ -2346,7 +2346,7 @@ static const void *device_namespace(struct kobject *kobj) > return ns; > } > > -static void device_get_ownership(struct kobject *kobj, kuid_t *uid, kgid_t *gid) > +static void device_get_ownership(const struct kobject *kobj, kuid_t *uid, kgid_t *gid) > { > const struct device *dev = kobj_to_dev(kobj); > > @@ -2986,9 +2986,9 @@ static void class_dir_release(struct kobject *kobj) > } > > static const > -struct kobj_ns_type_operations *class_dir_child_ns_type(struct kobject *kobj) > +struct kobj_ns_type_operations *class_dir_child_ns_type(const struct kobject *kobj) > { > - struct class_dir *dir = to_class_dir(kobj); > + const struct class_dir *dir = to_class_dir(kobj); > return dir->class->ns_type; > } > > diff --git a/fs/nfs/sysfs.c b/fs/nfs/sysfs.c > index a6f740366963..67a87800b3a9 100644 > --- a/fs/nfs/sysfs.c > +++ b/fs/nfs/sysfs.c > @@ -26,7 +26,7 @@ static void nfs_netns_object_release(struct kobject *kobj) > } > > static const struct kobj_ns_type_operations *nfs_netns_object_child_ns_type( > - struct kobject *kobj) > + const struct kobject *kobj) > { > return &net_ns_type_operations; > } > @@ -130,7 +130,7 @@ static void nfs_netns_client_release(struct kobject *kobj) > kfree(c); > } > > -static const void *nfs_netns_client_namespace(struct kobject *kobj) > +static const void *nfs_netns_client_namespace(const struct kobject *kobj) > { > return container_of(kobj, struct nfs_netns_client, kobject)->net; > } > diff --git a/include/linux/kobject.h b/include/linux/kobject.h > index fc40fc81aeb1..d978dbceb50d 100644 > --- a/include/linux/kobject.h > +++ b/include/linux/kobject.h > @@ -113,7 +113,7 @@ extern struct kobject * __must_check kobject_get_unless_zero( > extern void kobject_put(struct kobject *kobj); > > extern const void *kobject_namespace(struct kobject *kobj); > -extern void kobject_get_ownership(struct kobject *kobj, > +extern void kobject_get_ownership(const struct kobject *kobj, > kuid_t *uid, kgid_t *gid); > extern char *kobject_get_path(const struct kobject *kobj, gfp_t flag); > > @@ -121,9 +121,9 @@ struct kobj_type { > void (*release)(struct kobject *kobj); > const struct sysfs_ops *sysfs_ops; > const struct attribute_group **default_groups; > - const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj); > - const void *(*namespace)(struct kobject *kobj); > - void (*get_ownership)(struct kobject *kobj, kuid_t *uid, kgid_t *gid); > + const struct kobj_ns_type_operations *(*child_ns_type)(const struct kobject *kobj); > + const void *(*namespace)(const struct kobject *kobj); > + void (*get_ownership)(const struct kobject *kobj, kuid_t *uid, kgid_t *gid); > }; > > struct kobj_uevent_env { > diff --git a/lib/kobject.c b/lib/kobject.c > index ba1017cd67d1..26e744a46d24 100644 > --- a/lib/kobject.c > +++ b/lib/kobject.c > @@ -45,7 +45,7 @@ const void *kobject_namespace(struct kobject *kobj) > * representation of given kobject. Normally used to adjust ownership of > * objects in a container. > */ > -void kobject_get_ownership(struct kobject *kobj, kuid_t *uid, kgid_t *gid) > +void kobject_get_ownership(const struct kobject *kobj, kuid_t *uid, kgid_t *gid) > { > *uid = GLOBAL_ROOT_UID; > *gid = GLOBAL_ROOT_GID; > @@ -907,7 +907,7 @@ static void kset_release(struct kobject *kobj) > kfree(kset); > } > > -static void kset_get_ownership(struct kobject *kobj, kuid_t *uid, kgid_t *gid) > +static void kset_get_ownership(const struct kobject *kobj, kuid_t *uid, kgid_t *gid) > { > if (kobj->parent) > kobject_get_ownership(kobj->parent, uid, gid); > diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c > index 228fd5b20f10..ad13b48e3e08 100644 > --- a/net/bridge/br_if.c > +++ b/net/bridge/br_if.c > @@ -262,7 +262,7 @@ static void release_nbp(struct kobject *kobj) > kfree(p); > } > > -static void brport_get_ownership(struct kobject *kobj, kuid_t *uid, kgid_t *gid) > +static void brport_get_ownership(const struct kobject *kobj, kuid_t *uid, kgid_t *gid) > { > struct net_bridge_port *p = kobj_to_brport(kobj); > > diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c > index a8c5a7cd9701..9cfc80b8ed25 100644 > --- a/net/core/net-sysfs.c > +++ b/net/core/net-sysfs.c > @@ -1020,7 +1020,7 @@ static void rx_queue_release(struct kobject *kobj) > netdev_put(queue->dev, &queue->dev_tracker); > } > > -static const void *rx_queue_namespace(struct kobject *kobj) > +static const void *rx_queue_namespace(const struct kobject *kobj) > { > struct netdev_rx_queue *queue = to_rx_queue(kobj); > struct device *dev = &queue->dev->dev; > @@ -1032,7 +1032,7 @@ static const void *rx_queue_namespace(struct kobject *kobj) > return ns; > } > > -static void rx_queue_get_ownership(struct kobject *kobj, > +static void rx_queue_get_ownership(const struct kobject *kobj, > kuid_t *uid, kgid_t *gid) > { > const struct net *net = rx_queue_namespace(kobj); > @@ -1623,7 +1623,7 @@ static void netdev_queue_release(struct kobject *kobj) > netdev_put(queue->dev, &queue->dev_tracker); > } > > -static const void *netdev_queue_namespace(struct kobject *kobj) > +static const void *netdev_queue_namespace(const struct kobject *kobj) > { > struct netdev_queue *queue = to_netdev_queue(kobj); > struct device *dev = &queue->dev->dev; > @@ -1635,7 +1635,7 @@ static const void *netdev_queue_namespace(struct kobject *kobj) > return ns; > } > > -static void netdev_queue_get_ownership(struct kobject *kobj, > +static void netdev_queue_get_ownership(const struct kobject *kobj, > kuid_t *uid, kgid_t *gid) > { > const struct net *net = netdev_queue_namespace(kobj); > diff --git a/net/sunrpc/sysfs.c b/net/sunrpc/sysfs.c > index c1f559892ae8..1e05a2d723f4 100644 > --- a/net/sunrpc/sysfs.c > +++ b/net/sunrpc/sysfs.c > @@ -31,7 +31,7 @@ static void rpc_sysfs_object_release(struct kobject *kobj) > } > > static const struct kobj_ns_type_operations * > -rpc_sysfs_object_child_ns_type(struct kobject *kobj) > +rpc_sysfs_object_child_ns_type(const struct kobject *kobj) > { > return &net_ns_type_operations; > } > @@ -381,17 +381,17 @@ static void rpc_sysfs_xprt_release(struct kobject *kobj) > kfree(xprt); > } > > -static const void *rpc_sysfs_client_namespace(struct kobject *kobj) > +static const void *rpc_sysfs_client_namespace(const struct kobject *kobj) > { > return container_of(kobj, struct rpc_sysfs_client, kobject)->net; > } > > -static const void *rpc_sysfs_xprt_switch_namespace(struct kobject *kobj) > +static const void *rpc_sysfs_xprt_switch_namespace(const struct kobject *kobj) > { > return container_of(kobj, struct rpc_sysfs_xprt_switch, kobject)->net; > } > > -static const void *rpc_sysfs_xprt_namespace(struct kobject *kobj) > +static const void *rpc_sysfs_xprt_namespace(const struct kobject *kobj) > { > return container_of(kobj, struct rpc_sysfs_xprt, > kobject)->xprt->xprt_net; > -- > 2.38.1 >
On Mon, 21 Nov 2022 10:46:45 +0100 Greg Kroah-Hartman wrote: > The call, kobject_get_ownership(), does not modify the kobject passed > into it, so make it const. This propagates down into the kobj_type > function callbacks so make the kobject passed into them also const, > ensuring that nothing in the kobject is being changed here. > > This helps make it more obvious what calls and callbacks do, and do not, > modify structures passed to them. Acked-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/drivers/base/class.c b/drivers/base/class.c index 8ceafb7d0203..86ec554cfe60 100644 --- a/drivers/base/class.c +++ b/drivers/base/class.c @@ -62,7 +62,7 @@ static void class_release(struct kobject *kobj) kfree(cp); } -static const struct kobj_ns_type_operations *class_child_ns_type(struct kobject *kobj) +static const struct kobj_ns_type_operations *class_child_ns_type(const struct kobject *kobj) { struct subsys_private *cp = to_subsys_private(kobj); struct class *class = cp->class; diff --git a/drivers/base/core.c b/drivers/base/core.c index ab01828fe6c1..a79b99ecf4d8 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -2335,7 +2335,7 @@ static void device_release(struct kobject *kobj) kfree(p); } -static const void *device_namespace(struct kobject *kobj) +static const void *device_namespace(const struct kobject *kobj) { const struct device *dev = kobj_to_dev(kobj); const void *ns = NULL; @@ -2346,7 +2346,7 @@ static const void *device_namespace(struct kobject *kobj) return ns; } -static void device_get_ownership(struct kobject *kobj, kuid_t *uid, kgid_t *gid) +static void device_get_ownership(const struct kobject *kobj, kuid_t *uid, kgid_t *gid) { const struct device *dev = kobj_to_dev(kobj); @@ -2986,9 +2986,9 @@ static void class_dir_release(struct kobject *kobj) } static const -struct kobj_ns_type_operations *class_dir_child_ns_type(struct kobject *kobj) +struct kobj_ns_type_operations *class_dir_child_ns_type(const struct kobject *kobj) { - struct class_dir *dir = to_class_dir(kobj); + const struct class_dir *dir = to_class_dir(kobj); return dir->class->ns_type; } diff --git a/fs/nfs/sysfs.c b/fs/nfs/sysfs.c index a6f740366963..67a87800b3a9 100644 --- a/fs/nfs/sysfs.c +++ b/fs/nfs/sysfs.c @@ -26,7 +26,7 @@ static void nfs_netns_object_release(struct kobject *kobj) } static const struct kobj_ns_type_operations *nfs_netns_object_child_ns_type( - struct kobject *kobj) + const struct kobject *kobj) { return &net_ns_type_operations; } @@ -130,7 +130,7 @@ static void nfs_netns_client_release(struct kobject *kobj) kfree(c); } -static const void *nfs_netns_client_namespace(struct kobject *kobj) +static const void *nfs_netns_client_namespace(const struct kobject *kobj) { return container_of(kobj, struct nfs_netns_client, kobject)->net; } diff --git a/include/linux/kobject.h b/include/linux/kobject.h index fc40fc81aeb1..d978dbceb50d 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -113,7 +113,7 @@ extern struct kobject * __must_check kobject_get_unless_zero( extern void kobject_put(struct kobject *kobj); extern const void *kobject_namespace(struct kobject *kobj); -extern void kobject_get_ownership(struct kobject *kobj, +extern void kobject_get_ownership(const struct kobject *kobj, kuid_t *uid, kgid_t *gid); extern char *kobject_get_path(const struct kobject *kobj, gfp_t flag); @@ -121,9 +121,9 @@ struct kobj_type { void (*release)(struct kobject *kobj); const struct sysfs_ops *sysfs_ops; const struct attribute_group **default_groups; - const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj); - const void *(*namespace)(struct kobject *kobj); - void (*get_ownership)(struct kobject *kobj, kuid_t *uid, kgid_t *gid); + const struct kobj_ns_type_operations *(*child_ns_type)(const struct kobject *kobj); + const void *(*namespace)(const struct kobject *kobj); + void (*get_ownership)(const struct kobject *kobj, kuid_t *uid, kgid_t *gid); }; struct kobj_uevent_env { diff --git a/lib/kobject.c b/lib/kobject.c index ba1017cd67d1..26e744a46d24 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -45,7 +45,7 @@ const void *kobject_namespace(struct kobject *kobj) * representation of given kobject. Normally used to adjust ownership of * objects in a container. */ -void kobject_get_ownership(struct kobject *kobj, kuid_t *uid, kgid_t *gid) +void kobject_get_ownership(const struct kobject *kobj, kuid_t *uid, kgid_t *gid) { *uid = GLOBAL_ROOT_UID; *gid = GLOBAL_ROOT_GID; @@ -907,7 +907,7 @@ static void kset_release(struct kobject *kobj) kfree(kset); } -static void kset_get_ownership(struct kobject *kobj, kuid_t *uid, kgid_t *gid) +static void kset_get_ownership(const struct kobject *kobj, kuid_t *uid, kgid_t *gid) { if (kobj->parent) kobject_get_ownership(kobj->parent, uid, gid); diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 228fd5b20f10..ad13b48e3e08 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -262,7 +262,7 @@ static void release_nbp(struct kobject *kobj) kfree(p); } -static void brport_get_ownership(struct kobject *kobj, kuid_t *uid, kgid_t *gid) +static void brport_get_ownership(const struct kobject *kobj, kuid_t *uid, kgid_t *gid) { struct net_bridge_port *p = kobj_to_brport(kobj); diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index a8c5a7cd9701..9cfc80b8ed25 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -1020,7 +1020,7 @@ static void rx_queue_release(struct kobject *kobj) netdev_put(queue->dev, &queue->dev_tracker); } -static const void *rx_queue_namespace(struct kobject *kobj) +static const void *rx_queue_namespace(const struct kobject *kobj) { struct netdev_rx_queue *queue = to_rx_queue(kobj); struct device *dev = &queue->dev->dev; @@ -1032,7 +1032,7 @@ static const void *rx_queue_namespace(struct kobject *kobj) return ns; } -static void rx_queue_get_ownership(struct kobject *kobj, +static void rx_queue_get_ownership(const struct kobject *kobj, kuid_t *uid, kgid_t *gid) { const struct net *net = rx_queue_namespace(kobj); @@ -1623,7 +1623,7 @@ static void netdev_queue_release(struct kobject *kobj) netdev_put(queue->dev, &queue->dev_tracker); } -static const void *netdev_queue_namespace(struct kobject *kobj) +static const void *netdev_queue_namespace(const struct kobject *kobj) { struct netdev_queue *queue = to_netdev_queue(kobj); struct device *dev = &queue->dev->dev; @@ -1635,7 +1635,7 @@ static const void *netdev_queue_namespace(struct kobject *kobj) return ns; } -static void netdev_queue_get_ownership(struct kobject *kobj, +static void netdev_queue_get_ownership(const struct kobject *kobj, kuid_t *uid, kgid_t *gid) { const struct net *net = netdev_queue_namespace(kobj); diff --git a/net/sunrpc/sysfs.c b/net/sunrpc/sysfs.c index c1f559892ae8..1e05a2d723f4 100644 --- a/net/sunrpc/sysfs.c +++ b/net/sunrpc/sysfs.c @@ -31,7 +31,7 @@ static void rpc_sysfs_object_release(struct kobject *kobj) } static const struct kobj_ns_type_operations * -rpc_sysfs_object_child_ns_type(struct kobject *kobj) +rpc_sysfs_object_child_ns_type(const struct kobject *kobj) { return &net_ns_type_operations; } @@ -381,17 +381,17 @@ static void rpc_sysfs_xprt_release(struct kobject *kobj) kfree(xprt); } -static const void *rpc_sysfs_client_namespace(struct kobject *kobj) +static const void *rpc_sysfs_client_namespace(const struct kobject *kobj) { return container_of(kobj, struct rpc_sysfs_client, kobject)->net; } -static const void *rpc_sysfs_xprt_switch_namespace(struct kobject *kobj) +static const void *rpc_sysfs_xprt_switch_namespace(const struct kobject *kobj) { return container_of(kobj, struct rpc_sysfs_xprt_switch, kobject)->net; } -static const void *rpc_sysfs_xprt_namespace(struct kobject *kobj) +static const void *rpc_sysfs_xprt_namespace(const struct kobject *kobj) { return container_of(kobj, struct rpc_sysfs_xprt, kobject)->xprt->xprt_net;
The call, kobject_get_ownership(), does not modify the kobject passed into it, so make it const. This propagates down into the kobj_type function callbacks so make the kobject passed into them also const, ensuring that nothing in the kobject is being changed here. This helps make it more obvious what calls and callbacks do, and do not, modify structures passed to them. Cc: "Rafael J. Wysocki" <rafael@kernel.org> Cc: Trond Myklebust <trond.myklebust@hammerspace.com> Cc: Anna Schumaker <anna@kernel.org> Cc: Roopa Prabhu <roopa@nvidia.com> Cc: Nikolay Aleksandrov <razor@blackwall.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Paolo Abeni <pabeni@redhat.com> Cc: Chuck Lever <chuck.lever@oracle.com> Cc: Jeff Layton <jlayton@kernel.org> Cc: linux-nfs@vger.kernel.org Cc: bridge@lists.linux-foundation.org Cc: netdev@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/base/class.c | 2 +- drivers/base/core.c | 8 ++++---- fs/nfs/sysfs.c | 4 ++-- include/linux/kobject.h | 8 ++++---- lib/kobject.c | 4 ++-- net/bridge/br_if.c | 2 +- net/core/net-sysfs.c | 8 ++++---- net/sunrpc/sysfs.c | 8 ++++---- 8 files changed, 22 insertions(+), 22 deletions(-)