eventpoll-simplify-sysctl-declaration-with-register_sysctl.patch removed from -mm tree
The patch titled
Subject: eventpoll: simplify sysctl declaration with register_sysctl()
has been removed from the -mm tree. Its filename was
eventpoll-simplify-sysctl-declaration-with-register_sysctl.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Xiaoming Ni <[email protected]>
Subject: eventpoll: simplify sysctl declaration with register_sysctl()
The kernel/sysctl.c is a kitchen sink where everyone leaves their dirty dishes, this makes it very difficult to maintain.
To help with this maintenance let's start by moving sysctls to places where they actually belong. The proc sysctl maintainers do not want to know what sysctl knobs you wish to add for your own piece of code, we just care about the core logic.
So move the epoll_table sysctl to fs/eventpoll.c and use register_sysctl().
---
fs/eventpoll.c | 10 +++++++++- include/linux/poll.h | 2 -- include/linux/sysctl.h | 1 - kernel/sysctl.c | 7 ------- 4 files changed, 9 insertions(+), 11 deletions(-)
fs/eventpoll.c renamed from fs/eventpoll.c~eventpoll-simplify-sysctl-declaration-with-register_sysctl +9 -1
@@ -307,7 +307,7 @@ static void unlist_file(struct epitems_hstatic long long_zero;static long long_max =LONG_MAX ; -struct ctl_table epoll_table[] = { +static struct ctl_table epoll_table[] = { { .procname ="max_user_watches" , .data = &max_user_watches,
@@ -319,6 +319,13 @@ struct ctl_table epoll_table[] = { }, { } }; + +static void __init epoll_sysctls_init (void ) +{ +register_sysctl ("fs/epoll" , epoll_table); +} +#else +#define epoll_sysctls_init () do { } while (0)#endif /* CONFIG_SYSCTL */ static const struct file_operations eventpoll_fops;
@@ -2378,6 +2385,7 @@ static int __init eventpoll_init(void)/* Allocates slab cache used to allocate "struct eppoll_entry" */ pwq_cache =kmem_cache_create ("eventpoll_pwq" ,sizeof (struct eppoll_entry ),0 ,SLAB_PANIC |SLAB_ACCOUNT ,NULL ); +epoll_sysctls_init (); ephead_cache =kmem_cache_create ("ep_head" ,sizeof (struct epitems_head ),0 ,SLAB_PANIC |SLAB_ACCOUNT ,NULL );
include/linux/poll.h renamed from include/linux/poll.h~eventpoll-simplify-sysctl-declaration-with-register_sysctl +0 -2
@@ -8,12 +8,10 @@#include <linux/wait.h> #include <linux/string.h> #include <linux/fs.h> -#include <linux/sysctl.h> #include <linux/uaccess.h> #include <uapi/linux/poll.h> #include <uapi/linux/eventpoll.h> -extern struct ctl_table epoll_table[];/* for sysctl */ /* ~832 bytes of stack space used max in sys_select/sys_poll before allocating additional memory. */ #ifdef __clang__
include/linux/sysctl.h renamed from include/linux/sysctl.h~eventpoll-simplify-sysctl-declaration-with-register_sysctl +0 -1
@@ -219,7 +219,6 @@ extern int no_unaligned_warning;extern struct ctl_table sysctl_mount_point[];extern struct ctl_table random_table[];extern struct ctl_table firmware_config_table[]; -extern struct ctl_table epoll_table[];#else /* CONFIG_SYSCTL */ static inline struct ctl_table_header *register_sysctl_table (struct ctl_table * table)
kernel/sysctl.c renamed from kernel/sysctl.c~eventpoll-simplify-sysctl-declaration-with-register_sysctl +0 -7
@@ -3093,13 +3093,6 @@ static struct ctl_table fs_table[] = { .proc_handler = proc_dointvec, },#endif -#ifdef CONFIG_EPOLL - { - .procname = "epoll", - .mode = 0555, - .child = epoll_table, - }, -#endif#endif { .procname = "protected_symlinks",
_
Patches currently in -mm which might be from [email protected] are