ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

kernel: pid_namespace: simplify sysctls with register_sysctl()

Browse Source 
register_sysctl_paths() is only required if your child (directories)
have entries and pid_namespace does not. So use register_sysctl_init()
instead where we don't care about the return value and use
register_sysctl() where we do.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Acked-by: Jeff Xu <jeffxu@google.com>
Link: https://lore.kernel.org/r/20230302202826.776286-9-mcgrof@kernel.org
This commit is contained in:
Luis Chamberlain
2023-03-02 12:28:23 -08:00
parent 348551ddaf
commit 9e7c73c0b9
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/pid_namespace.c
View File

@@ -314,7 +314,6 @@ static struct ctl_table pid_ns_ctl_table[] = {
}, },
{ } { }
}; };
static struct ctl_path kern_path[] = { { .procname = "kernel", }, { } };
#endif /* CONFIG_CHECKPOINT_RESTORE */ #endif /* CONFIG_CHECKPOINT_RESTORE */
int reboot_pid_ns(struct pid_namespace *pid_ns, int cmd) int reboot_pid_ns(struct pid_namespace *pid_ns, int cmd)
@@ -473,7 +472,7 @@ static __init int pid_namespaces_init(void)
pid_ns_cachep = KMEM_CACHE(pid_namespace, SLAB_PANIC | SLAB_ACCOUNT); pid_ns_cachep = KMEM_CACHE(pid_namespace, SLAB_PANIC | SLAB_ACCOUNT);
#ifdef CONFIG_CHECKPOINT_RESTORE #ifdef CONFIG_CHECKPOINT_RESTORE
register_sysctl_paths(kern_path, pid_ns_ctl_table); register_sysctl_init("kernel", pid_ns_ctl_table);
#endif #endif
register_pid_ns_sysctl_table_vm(); register_pid_ns_sysctl_table_vm();

3
kernel/pid_sysctl.h
View File

@@ -46,10 +46,9 @@ static struct ctl_table pid_ns_ctl_table_vm[] = {
}, },
{ } { }
}; };
static struct ctl_path vm_path[] = { { .procname = "vm", }, { } };
static inline void register_pid_ns_sysctl_table_vm(void) static inline void register_pid_ns_sysctl_table_vm(void)
{ {
register_sysctl_paths(vm_path, pid_ns_ctl_table_vm); register_sysctl("vm", pid_ns_ctl_table_vm);
} }
#else #else
static inline void initialize_memfd_noexec_scope(struct pid_namespace *ns) {} static inline void initialize_memfd_noexec_scope(struct pid_namespace *ns) {}