diff options
| author | Xiaoming Ni <nixiaoming@huawei.com> | 2021-11-17 15:41:27 -0800 |
|---|---|---|
| committer | Luis Chamberlain <mcgrof@kernel.org> | 2021-11-18 12:41:11 -0800 |
| commit | eff0b1a581f42e5d41c54bb94c590d48774cfbd2 (patch) | |
| tree | d30c82a1f69f1cc258c8c3e188dde429742f8e54 | |
| parent | f413b2178aaff38d62d6c905d716d218388537a2 (diff) | |
| download | linux-next-eff0b1a581f42e5d41c54bb94c590d48774cfbd2.tar.gz | |
dnotify: move dnotify sysctl to dnotify.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.
So move dnotify sysctls to dnotify.c and use the new
register_sysctl_init() to register the sysctl interface.
Signed-off-by: Xiaoming Ni <nixiaoming@huawei.com>
[mcgrof: adjust the commit log to justify the move]
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
| -rw-r--r-- | fs/notify/dnotify/dnotify.c | 19 | ||||
| -rw-r--r-- | kernel/sysctl.c | 10 |
2 files changed, 19 insertions, 10 deletions
diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c index e85e13c50d6d4..68f40fe3fe05e 100644 --- a/fs/notify/dnotify/dnotify.c +++ b/fs/notify/dnotify/dnotify.c @@ -20,6 +20,24 @@ #include <linux/fsnotify_backend.h> int dir_notify_enable __read_mostly = 1; +#ifdef CONFIG_SYSCTL +static struct ctl_table dnotify_sysctls[] = { + { + .procname = "dir-notify-enable", + .data = &dir_notify_enable, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, + {} +}; +static void __init dnotify_sysctl_init(void) +{ + register_sysctl_init("fs", dnotify_sysctls, "dnotify_sysctls"); +} +#else +#define dnotify_sysctl_init() do { } while (0) +#endif static struct kmem_cache *dnotify_struct_cache __read_mostly; static struct kmem_cache *dnotify_mark_cache __read_mostly; @@ -386,6 +404,7 @@ static int __init dnotify_init(void) dnotify_group = fsnotify_alloc_group(&dnotify_fsnotify_ops); if (IS_ERR(dnotify_group)) panic("unable to allocate fsnotify group for dnotify\n"); + dnotify_sysctl_init(); return 0; } diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 20326d67b814b..7a90a12b9ea49 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -48,7 +48,6 @@ #include <linux/times.h> #include <linux/limits.h> #include <linux/dcache.h> -#include <linux/dnotify.h> #include <linux/syscalls.h> #include <linux/vmstat.h> #include <linux/nfs_fs.h> @@ -3090,15 +3089,6 @@ static struct ctl_table fs_table[] = { .proc_handler = proc_dointvec, }, #endif -#ifdef CONFIG_DNOTIFY - { - .procname = "dir-notify-enable", - .data = &dir_notify_enable, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif #ifdef CONFIG_MMU #ifdef CONFIG_FILE_LOCKING { |