diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-01-06 07:07:15 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-01-24 19:37:54 -0500 |
commit | 1f87f0b52b1d6581168cb80f86746bc4df918d01 (patch) | |
tree | 73576c0872c61c526ade225d6441a6610beb666b /include/linux/sysctl.h | |
parent | de4e83bd6b5e16d491ec068cd22801d5d063b07a (diff) |
sysctl: Move the implementation into fs/proc/proc_sysctl.c
Move the core sysctl code from kernel/sysctl.c and kernel/sysctl_check.c
into fs/proc/proc_sysctl.c.
Currently sysctl maintenance is hampered by the sysctl implementation
being split across 3 files with artificial layering between them.
Consolidate the entire sysctl implementation into 1 file so that
it is easier to see what is going on and hopefully allowing for
simpler maintenance.
For functions that are now only used in fs/proc/proc_sysctl.c remove
their declarations from sysctl.h and make them static in fs/proc/proc_sysctl.c
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'include/linux/sysctl.h')
-rw-r--r-- | include/linux/sysctl.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 5e3532e9599f..08cabbfddacb 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
@@ -1073,17 +1073,6 @@ extern void setup_sysctl_set(struct ctl_table_set *p, | |||
1073 | struct ctl_table_set *parent, | 1073 | struct ctl_table_set *parent, |
1074 | int (*is_seen)(struct ctl_table_set *)); | 1074 | int (*is_seen)(struct ctl_table_set *)); |
1075 | 1075 | ||
1076 | extern void sysctl_head_get(struct ctl_table_header *); | ||
1077 | extern void sysctl_head_put(struct ctl_table_header *); | ||
1078 | extern int sysctl_is_seen(struct ctl_table_header *); | ||
1079 | extern struct ctl_table_header *sysctl_head_grab(struct ctl_table_header *); | ||
1080 | extern struct ctl_table_header *sysctl_head_next(struct ctl_table_header *prev); | ||
1081 | extern struct ctl_table_header *__sysctl_head_next(struct nsproxy *namespaces, | ||
1082 | struct ctl_table_header *prev); | ||
1083 | extern void sysctl_head_finish(struct ctl_table_header *prev); | ||
1084 | extern int sysctl_perm(struct ctl_table_root *root, | ||
1085 | struct ctl_table *table, int op); | ||
1086 | |||
1087 | void register_sysctl_root(struct ctl_table_root *root); | 1076 | void register_sysctl_root(struct ctl_table_root *root); |
1088 | struct ctl_table_header *__register_sysctl_paths( | 1077 | struct ctl_table_header *__register_sysctl_paths( |
1089 | struct ctl_table_root *root, struct nsproxy *namespaces, | 1078 | struct ctl_table_root *root, struct nsproxy *namespaces, |
@@ -1093,7 +1082,6 @@ struct ctl_table_header *register_sysctl_paths(const struct ctl_path *path, | |||
1093 | struct ctl_table *table); | 1082 | struct ctl_table *table); |
1094 | 1083 | ||
1095 | void unregister_sysctl_table(struct ctl_table_header * table); | 1084 | void unregister_sysctl_table(struct ctl_table_header * table); |
1096 | int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table); | ||
1097 | 1085 | ||
1098 | extern int sysctl_init(void); | 1086 | extern int sysctl_init(void); |
1099 | #else /* CONFIG_SYSCTL */ | 1087 | #else /* CONFIG_SYSCTL */ |
@@ -1118,10 +1106,6 @@ static inline void setup_sysctl_set(struct ctl_table_set *p, | |||
1118 | { | 1106 | { |
1119 | } | 1107 | } |
1120 | 1108 | ||
1121 | static inline void sysctl_head_put(struct ctl_table_header *head) | ||
1122 | { | ||
1123 | } | ||
1124 | |||
1125 | #endif /* CONFIG_SYSCTL */ | 1109 | #endif /* CONFIG_SYSCTL */ |
1126 | 1110 | ||
1127 | #endif /* __KERNEL__ */ | 1111 | #endif /* __KERNEL__ */ |