summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/proc/proc_sysctl.c11
-rw-r--r--include/linux/sysctl.h3
-rw-r--r--net/sysctl_net.c5
3 files changed, 10 insertions, 9 deletions
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 9d8223cd3655..86d32a318e2c 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -995,13 +995,20 @@ struct ctl_table_header *__register_sysctl_paths(
header->attached_by = header->ctl_table;
header->attached_to = root_table;
header->parent = &root_table_header;
- for (set = header->set; set; set = set->parent) {
+ set = header->set;
+ root = header->root;
+ for (;;) {
struct ctl_table_header *p;
list_for_each_entry(p, &set->list, ctl_entry) {
if (p->unregistering)
continue;
try_attach(p, header);
}
+ if (root == &sysctl_table_root)
+ break;
+ root = list_entry(root->root_list.prev,
+ struct ctl_table_root, root_list);
+ set = lookup_header_set(root, namespaces);
}
header->parent->count++;
list_add_tail(&header->ctl_entry, &header->set->list);
@@ -1072,11 +1079,9 @@ void unregister_sysctl_table(struct ctl_table_header * header)
EXPORT_SYMBOL(unregister_sysctl_table);
void setup_sysctl_set(struct ctl_table_set *p,
- struct ctl_table_set *parent,
int (*is_seen)(struct ctl_table_set *))
{
INIT_LIST_HEAD(&p->list);
- p->parent = parent ? parent : &sysctl_table_root.default_set;
p->is_seen = is_seen;
}
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 475ff0e35e63..43c36acdb628 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -1047,7 +1047,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,7 +1069,6 @@ 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 retire_sysctl_set(struct ctl_table_set *set);
@@ -1102,7 +1100,6 @@ 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 *))
{
}
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index ffd67a6515a3..07c6b879c8b2 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -75,7 +75,6 @@ static struct ctl_table_root net_sysctl_ro_root = {
static int __net_init sysctl_net_init(struct net *net)
{
setup_sysctl_set(&net->sysctls,
- &net_sysctl_ro_root.default_set,
is_seen);
return 0;
}
@@ -96,9 +95,9 @@ static __init int net_sysctl_init(void)
ret = register_pernet_subsys(&sysctl_pernet_ops);
if (ret)
goto out;
- register_sysctl_root(&net_sysctl_root);
- setup_sysctl_set(&net_sysctl_ro_root.default_set, NULL, NULL);
+ setup_sysctl_set(&net_sysctl_ro_root.default_set, NULL);
register_sysctl_root(&net_sysctl_ro_root);
+ register_sysctl_root(&net_sysctl_root);
out:
return ret;
}