Messages in this thread Patch in this message | | | Date | Sat, 20 Feb 2010 22:23:12 +0800 | From | Dave Young <> | Subject | [PATCH 18/18] sysctl extern cleanup - inotify |
| |
Extern declarations in sysctl.c should be move to their own head file, and then include them in relavant .c files.
Move inotify_table extern declaration to linux/inotify.h
Signed-off-by: Dave Young <hidave.darkstar@gmail.com> --- include/linux/inotify.h | 6 ++++++ kernel/sysctl.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-)
--- linux-2.6.32.orig/kernel/sysctl.c 2010-02-20 14:43:20.458847237 +0800 +++ linux-2.6.32/kernel/sysctl.c 2010-02-20 14:44:20.745507688 +0800 @@ -45,6 +45,7 @@ #include <linux/limits.h> #include <linux/dcache.h> #include <linux/dnotify.h> +#include <linux/inotify.h> #include <linux/syscalls.h> #include <linux/vmstat.h> #include <linux/nfs_fs.h> @@ -160,9 +161,6 @@ static struct ctl_table fs_table[]; static struct ctl_table debug_table[]; static struct ctl_table dev_table[]; extern struct ctl_table random_table[]; -#ifdef CONFIG_INOTIFY_USER -extern struct ctl_table inotify_table[]; -#endif /* The default sysctl tables: */ --- linux-2.6.32.orig/include/linux/inotify.h 2010-02-20 14:02:15.074926187 +0800 +++ linux-2.6.32/include/linux/inotify.h 2010-02-20 14:44:20.745507688 +0800 @@ -69,4 +69,10 @@ struct inotify_event { #define IN_CLOEXEC O_CLOEXEC #define IN_NONBLOCK O_NONBLOCK +#ifdef __KERNEL__ +#if defined(CONFIG_INOTIFY_USER) && defined(CONFIG_SYSCTL) +extern struct ctl_table inotify_table[]; +#endif +#endif + #endif /* _LINUX_INOTIFY_H */
| |