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>
This commit is contained in:
@@ -1073,17 +1073,6 @@ extern void setup_sysctl_set(struct ctl_table_set *p,
|
||||
struct ctl_table_set *parent,
|
||||
int (*is_seen)(struct ctl_table_set *));
|
||||
|
||||
extern void sysctl_head_get(struct ctl_table_header *);
|
||||
extern void sysctl_head_put(struct ctl_table_header *);
|
||||
extern int sysctl_is_seen(struct ctl_table_header *);
|
||||
extern struct ctl_table_header *sysctl_head_grab(struct ctl_table_header *);
|
||||
extern struct ctl_table_header *sysctl_head_next(struct ctl_table_header *prev);
|
||||
extern struct ctl_table_header *__sysctl_head_next(struct nsproxy *namespaces,
|
||||
struct ctl_table_header *prev);
|
||||
extern void sysctl_head_finish(struct ctl_table_header *prev);
|
||||
extern int sysctl_perm(struct ctl_table_root *root,
|
||||
struct ctl_table *table, int op);
|
||||
|
||||
void register_sysctl_root(struct ctl_table_root *root);
|
||||
struct ctl_table_header *__register_sysctl_paths(
|
||||
struct ctl_table_root *root, struct nsproxy *namespaces,
|
||||
@@ -1093,7 +1082,6 @@ struct ctl_table_header *register_sysctl_paths(const struct ctl_path *path,
|
||||
struct ctl_table *table);
|
||||
|
||||
void unregister_sysctl_table(struct ctl_table_header * table);
|
||||
int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table);
|
||||
|
||||
extern int sysctl_init(void);
|
||||
#else /* CONFIG_SYSCTL */
|
||||
@@ -1118,10 +1106,6 @@ static inline void setup_sysctl_set(struct ctl_table_set *p,
|
||||
{
|
||||
}
|
||||
|
||||
static inline void sysctl_head_put(struct ctl_table_header *head)
|
||||
{
|
||||
}
|
||||
|
||||
#endif /* CONFIG_SYSCTL */
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
Reference in New Issue
Block a user