aio-move-aio-sysctl-to-aioc.patch removed from -mm tree
The patch titled
Subject: aio: move aio sysctl to aio.c
has been removed from the -mm tree. Its filename was
aio-move-aio-sysctl-to-aioc.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Xiaoming Ni <[email protected]>
Subject: aio: move aio sysctl to aio.c
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.
Move aio sysctl to aio.c and use the new register_sysctl_init() to register the sysctl interface for aio.
---
fs/aio.c | 31 +++++++++++++++++++++++++++++-- include/linux/aio.h | 4 ---- kernel/sysctl.c | 17 ----------------- 3 files changed, 29 insertions(+), 23 deletions(-)
fs/aio.c renamed from fs/aio.c~aio-move-aio-sysctl-to-aioc +29 -2
@@ -220,9 +220,35 @@ struct aio_kiocb {/*------ sysctl variables----*/ static DEFINE_SPINLOCK (aio_nr_lock); -unsigned long aio_nr;/* current system wide number of aio requests */ -unsigned long aio_max_nr =0x10000 ;/* system wide maximum number of aio requests */ +static unsigned long aio_nr;/* current system wide number of aio requests */ +static unsigned long aio_max_nr =0x10000 ;/* system wide maximum number of aio requests */ /*----end sysctl variables---*/ +#ifdef CONFIG_SYSCTL +static struct ctl_table aio_sysctls[] = { + { + .procname ="aio-nr" , + .data = &aio_nr, + .maxlen =sizeof (aio_nr), + .mode =0444 , + .proc_handler = proc_doulongvec_minmax, + }, + { + .procname ="aio-max-nr" , + .data = &aio_max_nr, + .maxlen =sizeof (aio_max_nr), + .mode =0644 , + .proc_handler = proc_doulongvec_minmax, + }, + {} +}; + +static void __init aio_sysctl_init (void ) +{ +register_sysctl_init ("fs" , aio_sysctls); +} +#else +#define aio_sysctl_init () do { } while (0) +#endif static struct kmem_cache *kiocb_cachep;static struct kmem_cache *kioctx_cachep;
@@ -275,6 +301,7 @@ static int __init aio_setup(void) kiocb_cachep =KMEM_CACHE (aio_kiocb,SLAB_HWCACHE_ALIGN |SLAB_PANIC ); kioctx_cachep =KMEM_CACHE (kioctx,SLAB_HWCACHE_ALIGN |SLAB_PANIC ); +aio_sysctl_init ();return 0 ; }__initcall (aio_setup);
include/linux/aio.h renamed from include/linux/aio.h~aio-move-aio-sysctl-to-aioc +0 -4
@@ -20,8 +20,4 @@ static inline void kiocb_set_cancel_fn(s kiocb_cancel_fn *cancel) { }#endif /* CONFIG_AIO */ -/* for sysctl: */ -extern unsigned long aio_nr; -extern unsigned long aio_max_nr; -#endif /* __LINUX__AIO_H */
kernel/sysctl.c renamed from kernel/sysctl.c~aio-move-aio-sysctl-to-aioc +0 -17
@@ -20,7 +20,6 @@*/ #include <linux/module.h> -#include <linux/aio.h> #include <linux/mm.h> #include <linux/swap.h> #include <linux/slab.h>
@@ -3111,22 +3110,6 @@ static struct ctl_table fs_table[] = { .proc_handler = proc_dointvec, },#endif -#ifdef CONFIG_AIO - { - .procname = "aio-nr", - .data = &aio_nr, - .maxlen = sizeof(aio_nr), - .mode = 0444, - .proc_handler = proc_doulongvec_minmax, - }, - { - .procname = "aio-max-nr", - .data = &aio_max_nr, - .maxlen = sizeof(aio_max_nr), - .mode = 0644, - .proc_handler = proc_doulongvec_minmax, - }, -#endif /* CONFIG_AIO */#ifdef CONFIG_INOTIFY_USER { .procname = "inotify",
_
Patches currently in -mm which might be from [email protected] are