sched: rt-group: fix hierarchy

[linux-2.6] / net / unix / sysctl_net_unix.c

diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
index 43dd356730fd4d5e95ab2bdeee011f9b44ee63a2..77513d7e35f2522251452754deaa4c1b949a2ed3 100644 (file)
--- a/net/unix/sysctl_net_unix.c
+++ b/net/unix/sysctl_net_unix.c
@@ -18,7 +18,7 @@ static ctl_table unix_table[] = {
        {
                .ctl_name       = NET_UNIX_MAX_DGRAM_QLEN,
                .procname       = "max_dgram_qlen",
-               .data           = &init_net.sysctl_unix_max_dgram_qlen,
+               .data           = &init_net.unx.sysctl_max_dgram_qlen,
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec
@@ -32,16 +32,33 @@ static struct ctl_path unix_path[] = {
        { },
 };
 
-static struct ctl_table_header * unix_sysctl_header;
-
 int unix_sysctl_register(struct net *net)
 {
-       unix_sysctl_header = register_sysctl_paths(unix_path, unix_table);
-       return unix_sysctl_header == NULL ? -ENOMEM : 0;
+       struct ctl_table *table;
+
+       table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);
+       if (table == NULL)
+               goto err_alloc;
+
+       table[0].data = &net->unx.sysctl_max_dgram_qlen;
+       net->unx.ctl = register_net_sysctl_table(net, unix_path, table);
+       if (net->unx.ctl == NULL)
+               goto err_reg;
+
+       return 0;
+
+err_reg:
+       kfree(table);
+err_alloc:
+       return -ENOMEM;
 }
 
 void unix_sysctl_unregister(struct net *net)
 {
-       unregister_sysctl_table(unix_sysctl_header);
+       struct ctl_table *table;
+
+       table = net->unx.ctl->ctl_table_arg;
+       unregister_sysctl_table(net->unx.ctl);
+       kfree(table);
 }