[NET]: Isolate the net/core/ sysctl table

Using ctl paths we can put all the stuff, related to net/core/
sysctl table, into one file and remove all the references on it.

As a good side effect this hides the "core_table" name from
the global scope :)

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sock.h b/include/net/sock.h
index 800e73a62d8f579ca34e8b2bf7dd3fbadfa321f4..4ce37ce8c411a89b012d9266f2e7b08c9556ee19 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1325,10 +1325,6 @@ extern __u32 sysctl_rmem_max;
 
 extern void sk_init(void);
 
-#ifdef CONFIG_SYSCTL
-extern struct ctl_table core_table[];
-#endif
-
 extern int sysctl_optmem_max;
 
 extern __u32 sysctl_wmem_default;

diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 277c8faaf732719685185e2abaec8e8611fdf293..e322713e590ae35e84ac7d575c8c0dda5a778e33 100644 (file)
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -10,10 +10,11 @@
 #include <linux/module.h>
 #include <linux/socket.h>
 #include <linux/netdevice.h>
+#include <linux/init.h>
 #include <net/sock.h>
 #include <net/xfrm.h>
 
-ctl_table core_table[] = {
+static struct ctl_table net_core_table[] = {
 #ifdef CONFIG_NET
        {
                .ctl_name       = NET_CORE_WMEM_MAX,
@@ -149,3 +150,19 @@ ctl_table core_table[] = {
        },
        { .ctl_name = 0 }
 };
+
+static __initdata struct ctl_path net_core_path[] = {
+       { .procname = "net", .ctl_name = CTL_NET, },
+       { .procname = "core", .ctl_name = NET_CORE, },
+       { },
+};
+
+static __init int sysctl_core_init(void)
+{
+       struct ctl_table_header *hdr;
+
+       hdr = register_sysctl_paths(net_core_path, net_core_table);
+       return hdr == NULL ? -ENOMEM : 0;
+}
+
+__initcall(sysctl_core_init);

diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index c50c793aa7f00fa4eeb7184de2b75de323331b84..747fc55b28f1bbea7b2632fa85e216eb5cb6b8ef 100644 (file)
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -31,12 +31,6 @@
 #endif
 
 struct ctl_table net_table[] = {
-       {
-               .ctl_name       = NET_CORE,
-               .procname       = "core",
-               .mode           = 0555,
-               .child          = core_table,
-       },
 #ifdef CONFIG_INET
        {
                .ctl_name       = NET_IPV4,