sysctl: Remove the now unused ctl_table parent field.

[~andy/linux] / include / linux / sysctl.h

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 5e3532e9599f8be12fdbcfb1dd70e35b64c29f8a..094bc5ccf1e2e63f4e8b2df64f586152a79f42c7 100644 (file)
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -1015,8 +1015,7 @@ struct ctl_table
        void *data;
        int maxlen;
        umode_t mode;
-       struct ctl_table *child;
-       struct ctl_table *parent;       /* Automatically set */
+       struct ctl_table *child;        /* Deprecated */
        proc_handler *proc_handler;     /* Callback for text formatting */
        struct ctl_table_poll *poll;
        void *extra1;
@@ -1047,7 +1046,6 @@ struct ctl_table_header
 
 struct ctl_table_set {
        struct list_head list;
-       struct ctl_table_set *parent;
        int (*is_seen)(struct ctl_table_set *);
 };
 
@@ -1070,21 +1068,13 @@ struct ctl_path {
 void proc_sys_poll_notify(struct ctl_table_poll *poll);
 
 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);
+extern void retire_sysctl_set(struct ctl_table_set *set);
 
 void register_sysctl_root(struct ctl_table_root *root);
+struct ctl_table_header *__register_sysctl_table(
+       struct ctl_table_root *root, struct nsproxy *namespaces,
+       const char *path, struct ctl_table *table);
 struct ctl_table_header *__register_sysctl_paths(
        struct ctl_table_root *root, struct nsproxy *namespaces,
        const struct ctl_path *path, struct ctl_table *table);
@@ -1093,7 +1083,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 */
@@ -1113,15 +1102,10 @@ static inline void unregister_sysctl_table(struct ctl_table_header * table)
 }
 
 static inline void setup_sysctl_set(struct ctl_table_set *p,
-       struct ctl_table_set *parent,
        int (*is_seen)(struct ctl_table_set *))
 {
 }
 
-static inline void sysctl_head_put(struct ctl_table_header *head)
-{
-}
-
 #endif /* CONFIG_SYSCTL */
 
 #endif /* __KERNEL__ */