diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-01-23 00:26:00 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-01-24 19:40:29 -0500 |
commit | 9eb47c26f09e27506d343ef52e634b2a50ee21ef (patch) | |
tree | 6055ec285771cf35c233d63c783b5c8381847094 /net/sysctl_net.c | |
parent | 6a75ce167c53b41f15088d3c2c7e51c89dc8798a (diff) |
sysctl: Add a root pointer to ctl_table_set
Add a ctl_table_root pointer to ctl_table set so it is easy to
go from a ctl_table_set to a ctl_table_root.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'net/sysctl_net.c')
-rw-r--r-- | net/sysctl_net.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sysctl_net.c b/net/sysctl_net.c index 07c6b879c8b2..e998c6448046 100644 --- a/net/sysctl_net.c +++ b/net/sysctl_net.c | |||
@@ -74,8 +74,7 @@ static struct ctl_table_root net_sysctl_ro_root = { | |||
74 | 74 | ||
75 | static int __net_init sysctl_net_init(struct net *net) | 75 | static int __net_init sysctl_net_init(struct net *net) |
76 | { | 76 | { |
77 | setup_sysctl_set(&net->sysctls, | 77 | setup_sysctl_set(&net->sysctls, &net_sysctl_root, is_seen); |
78 | is_seen); | ||
79 | return 0; | 78 | return 0; |
80 | } | 79 | } |
81 | 80 | ||
@@ -95,7 +94,7 @@ static __init int net_sysctl_init(void) | |||
95 | ret = register_pernet_subsys(&sysctl_pernet_ops); | 94 | ret = register_pernet_subsys(&sysctl_pernet_ops); |
96 | if (ret) | 95 | if (ret) |
97 | goto out; | 96 | goto out; |
98 | setup_sysctl_set(&net_sysctl_ro_root.default_set, NULL); | 97 | setup_sysctl_set(&net_sysctl_ro_root.default_set, &net_sysctl_ro_root, NULL); |
99 | register_sysctl_root(&net_sysctl_ro_root); | 98 | register_sysctl_root(&net_sysctl_ro_root); |
100 | register_sysctl_root(&net_sysctl_root); | 99 | register_sysctl_root(&net_sysctl_root); |
101 | out: | 100 | out: |