summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric W. Biederman2012-01-23 06:26:00 +0100
committerEric W. Biederman2012-01-25 01:40:29 +0100
commit9eb47c26f09e27506d343ef52e634b2a50ee21ef (patch)
tree6055ec285771cf35c233d63c783b5c8381847094 /net
parentsysctl: Rewrite proc_sys_readdir in terms of first_entry and next_entry (diff)
downloadkernel-qcow2-linux-9eb47c26f09e27506d343ef52e634b2a50ee21ef.tar.gz
kernel-qcow2-linux-9eb47c26f09e27506d343ef52e634b2a50ee21ef.tar.xz
kernel-qcow2-linux-9eb47c26f09e27506d343ef52e634b2a50ee21ef.zip
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')
-rw-r--r--net/sysctl_net.c5
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 = {
static int __net_init sysctl_net_init(struct net *net)
{
- setup_sysctl_set(&net->sysctls,
- is_seen);
+ setup_sysctl_set(&net->sysctls, &net_sysctl_root, is_seen);
return 0;
}
@@ -95,7 +94,7 @@ static __init int net_sysctl_init(void)
ret = register_pernet_subsys(&sysctl_pernet_ops);
if (ret)
goto out;
- setup_sysctl_set(&net_sysctl_ro_root.default_set, NULL);
+ setup_sysctl_set(&net_sysctl_ro_root.default_set, &net_sysctl_ro_root, NULL);
register_sysctl_root(&net_sysctl_ro_root);
register_sysctl_root(&net_sysctl_root);
out: