aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc/proc_sysctl.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-01-22 21:10:21 -0800
committerEric W. Biederman <ebiederm@xmission.com>2012-01-24 16:37:55 -0800
commitbd295b56cfae85f2dd6c2b03951480c91e6d08f3 (patch)
tree7f8667dbf6c297897b6427d228885d565e263c66 /fs/proc/proc_sysctl.c
parent97324cd804b7b9fb6044e114329335db79810425 (diff)
sysctl: Remove the unnecessary sysctl_set parent concept.
In sysctl_net register the two networking roots in the proper order. In register_sysctl walk the sysctl sets in the reverse order of the sysctl roots. Remove parent from ctl_table_set and setup_sysctl_set as it is no longer needed. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'fs/proc/proc_sysctl.c')
-rw-r--r--fs/proc/proc_sysctl.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 9d8223cd365..86d32a318e2 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;
}