diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-12-21 12:15:21 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-12-21 12:15:21 -0800 |
| commit | c183e6c3ec342624c43269c099050d01eeb67e63 (patch) | |
| tree | bbfd027f74581221debe1d31e3b472cc0d03cf3b /include/linux/kobject_ns.h | |
| parent | 9054b41c4e1b5725e573c13166cee56bf7034bbd (diff) | |
| parent | 609d3bc6230514a8ca79b377775b17e8c3d9ac93 (diff) | |
| download | lwn-c183e6c3ec342624c43269c099050d01eeb67e63.tar.gz lwn-c183e6c3ec342624c43269c099050d01eeb67e63.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/linux/kobject_ns.h')
| -rw-r--r-- | include/linux/kobject_ns.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h index 2b5b64256cf4..be707748e7ce 100644 --- a/include/linux/kobject_ns.h +++ b/include/linux/kobject_ns.h @@ -47,8 +47,8 @@ struct kobj_ns_type_operations { int kobj_ns_type_register(const struct kobj_ns_type_operations *ops); int kobj_ns_type_registered(enum kobj_ns_type type); -const struct kobj_ns_type_operations *kobj_child_ns_ops(struct kobject *parent); -const struct kobj_ns_type_operations *kobj_ns_ops(struct kobject *kobj); +const struct kobj_ns_type_operations *kobj_child_ns_ops(const struct kobject *parent); +const struct kobj_ns_type_operations *kobj_ns_ops(const struct kobject *kobj); bool kobj_ns_current_may_mount(enum kobj_ns_type type); void *kobj_ns_grab_current(enum kobj_ns_type type); |