net: spread __net_init, __net_exit

[safe/jmp/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 eb0bd57..d095c7b 100644 (file)
--- a/net/unix/sysctl_net_unix.c
+++ b/net/unix/sysctl_net_unix.c
@@ -16,45 +16,47 @@
 
 static ctl_table unix_table[] = {
        {
-               .ctl_name       = NET_UNIX_MAX_DGRAM_QLEN,
                .procname       = "max_dgram_qlen",
-               .data           = &sysctl_unix_max_dgram_qlen,
+               .data           = &init_net.unx.sysctl_max_dgram_qlen,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec
+               .proc_handler   = proc_dointvec
        },
-       { .ctl_name = 0 }
+       { }
 };
 
-static ctl_table unix_net_table[] = {
-       {
-               .ctl_name       = NET_UNIX,
-               .procname       = "unix",
-               .mode           = 0555,
-               .child          = unix_table
-       },
-       { .ctl_name = 0 }
+static struct ctl_path unix_path[] = {
+       { .procname = "net", },
+       { .procname = "unix", },
+       { },
 };
 
-static ctl_table unix_root_table[] = {
-       {
-               .ctl_name       = CTL_NET,
-               .procname       = "net",
-               .mode           = 0555,
-               .child          = unix_net_table
-       },
-       { .ctl_name = 0 }
-};
+int __net_init unix_sysctl_register(struct net *net)
+{
+       struct ctl_table *table;
 
-static struct ctl_table_header * unix_sysctl_header;
+       table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);
+       if (table == NULL)
+               goto err_alloc;
 
-void unix_sysctl_register(void)
-{
-       unix_sysctl_header = register_sysctl_table(unix_root_table);
+       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(void)
+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);
+}