aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-02-14 03:34:09 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-14 11:09:59 -0500
commit0b4d414714f0d2f922d39424b0c5c82ad900a381 (patch)
tree5079ec59a5622c9cacfe0fce484ba2c4626c406f /net
parentae836810263509ff7a3c2c021754ce6f66b3fab6 (diff)
[PATCH] sysctl: remove insert_at_head from register_sysctl
The semantic effect of insert_at_head is that it would allow new registered sysctl entries to override existing sysctl entries of the same name. Which is pain for caching and the proc interface never implemented. I have done an audit and discovered that none of the current users of register_sysctl care as (excpet for directories) they do not register duplicate sysctl entries. So this patch simply removes the support for overriding existing entries in the sys_sysctl interface since no one uses it or cares and it makes future enhancments harder. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Acked-by: Ralf Baechle <ralf@linux-mips.org> Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Russell King <rmk@arm.linux.org.uk> Cc: David Howells <dhowells@redhat.com> Cc: "Luck, Tony" <tony.luck@intel.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Andi Kleen <ak@muc.de> Cc: Jens Axboe <axboe@kernel.dk> Cc: Corey Minyard <minyard@acm.org> Cc: Neil Brown <neilb@suse.de> Cc: "John W. Linville" <linville@tuxdriver.com> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: Jan Kara <jack@ucw.cz> Cc: Trond Myklebust <trond.myklebust@fys.uio.no> Cc: Mark Fasheh <mark.fasheh@oracle.com> Cc: David Chinner <dgc@sgi.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Patrick McHardy <kaber@trash.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/appletalk/sysctl_net_atalk.c2
-rw-r--r--net/ax25/sysctl_net_ax25.c2
-rw-r--r--net/bridge/br_netfilter.c2
-rw-r--r--net/core/neighbour.c2
-rw-r--r--net/dccp/sysctl.c2
-rw-r--r--net/decnet/dn_dev.c2
-rw-r--r--net/decnet/sysctl_net_decnet.c2
-rw-r--r--net/ipv4/devinet.c4
-rw-r--r--net/ipv4/ipvs/ip_vs_ctl.c2
-rw-r--r--net/ipv4/ipvs/ip_vs_lblc.c2
-rw-r--r--net/ipv4/ipvs/ip_vs_lblcr.c2
-rw-r--r--net/ipv4/netfilter/ip_conntrack_proto_sctp.c2
-rw-r--r--net/ipv4/netfilter/ip_conntrack_standalone.c2
-rw-r--r--net/ipv4/netfilter/ip_queue.c2
-rw-r--r--net/ipv6/addrconf.c4
-rw-r--r--net/ipv6/netfilter/ip6_queue.c2
-rw-r--r--net/ipv6/sysctl_net_ipv6.c2
-rw-r--r--net/ipx/sysctl_net_ipx.c2
-rw-r--r--net/irda/irsysctl.c2
-rw-r--r--net/llc/sysctl_net_llc.c2
-rw-r--r--net/netfilter/nf_conntrack_standalone.c2
-rw-r--r--net/netfilter/nf_sysctl.c2
-rw-r--r--net/netrom/sysctl_net_netrom.c2
-rw-r--r--net/rose/sysctl_net_rose.c2
-rw-r--r--net/rxrpc/sysctl.c2
-rw-r--r--net/sctp/sysctl.c2
-rw-r--r--net/sunrpc/sysctl.c2
-rw-r--r--net/sunrpc/xprtsock.c2
-rw-r--r--net/unix/sysctl_net_unix.c2
-rw-r--r--net/x25/sysctl_net_x25.c2
30 files changed, 32 insertions, 32 deletions
diff --git a/net/appletalk/sysctl_net_atalk.c b/net/appletalk/sysctl_net_atalk.c
index 4f806b6dd227..7df1778e221a 100644
--- a/net/appletalk/sysctl_net_atalk.c
+++ b/net/appletalk/sysctl_net_atalk.c
@@ -73,7 +73,7 @@ static struct ctl_table_header *atalk_table_header;
73 73
74void atalk_register_sysctl(void) 74void atalk_register_sysctl(void)
75{ 75{
76 atalk_table_header = register_sysctl_table(atalk_root_table, 0); 76 atalk_table_header = register_sysctl_table(atalk_root_table);
77} 77}
78 78
79void atalk_unregister_sysctl(void) 79void atalk_unregister_sysctl(void)
diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
index afdba0466f14..443a83676638 100644
--- a/net/ax25/sysctl_net_ax25.c
+++ b/net/ax25/sysctl_net_ax25.c
@@ -245,7 +245,7 @@ void ax25_register_sysctl(void)
245 245
246 ax25_dir_table[0].child = ax25_table; 246 ax25_dir_table[0].child = ax25_table;
247 247
248 ax25_table_header = register_sysctl_table(ax25_root_table, 0); 248 ax25_table_header = register_sysctl_table(ax25_root_table);
249} 249}
250 250
251void ax25_unregister_sysctl(void) 251void ax25_unregister_sysctl(void)
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index a0744e653f09..7712d76f06ba 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -957,7 +957,7 @@ int __init br_netfilter_init(void)
957 if (ret < 0) 957 if (ret < 0)
958 return ret; 958 return ret;
959#ifdef CONFIG_SYSCTL 959#ifdef CONFIG_SYSCTL
960 brnf_sysctl_header = register_sysctl_table(brnf_net_table, 0); 960 brnf_sysctl_header = register_sysctl_table(brnf_net_table);
961 if (brnf_sysctl_header == NULL) { 961 if (brnf_sysctl_header == NULL) {
962 printk(KERN_WARNING 962 printk(KERN_WARNING
963 "br_netfilter: can't register to sysctl.\n"); 963 "br_netfilter: can't register to sysctl.\n");
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index a1525fb7a81e..3183142c6044 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2707,7 +2707,7 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,
2707 t->neigh_proto_dir[0].child = t->neigh_neigh_dir; 2707 t->neigh_proto_dir[0].child = t->neigh_neigh_dir;
2708 t->neigh_root_dir[0].child = t->neigh_proto_dir; 2708 t->neigh_root_dir[0].child = t->neigh_proto_dir;
2709 2709
2710 t->sysctl_header = register_sysctl_table(t->neigh_root_dir, 0); 2710 t->sysctl_header = register_sysctl_table(t->neigh_root_dir);
2711 if (!t->sysctl_header) { 2711 if (!t->sysctl_header) {
2712 err = -ENOBUFS; 2712 err = -ENOBUFS;
2713 goto free_procname; 2713 goto free_procname;
diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c
index 33916318ed6d..1260aabac5e1 100644
--- a/net/dccp/sysctl.c
+++ b/net/dccp/sysctl.c
@@ -127,7 +127,7 @@ static struct ctl_table_header *dccp_table_header;
127 127
128int __init dccp_sysctl_init(void) 128int __init dccp_sysctl_init(void)
129{ 129{
130 dccp_table_header = register_sysctl_table(dccp_root_table, 0); 130 dccp_table_header = register_sysctl_table(dccp_root_table);
131 131
132 return dccp_table_header != NULL ? 0 : -ENOMEM; 132 return dccp_table_header != NULL ? 0 : -ENOMEM;
133} 133}
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 2b2c7fe45a71..0977df42c205 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -282,7 +282,7 @@ static void dn_dev_sysctl_register(struct net_device *dev, struct dn_dev_parms *
282 t->dn_dev_root_dir[0].de = NULL; 282 t->dn_dev_root_dir[0].de = NULL;
283 t->dn_dev_vars[0].extra1 = (void *)dev; 283 t->dn_dev_vars[0].extra1 = (void *)dev;
284 284
285 t->sysctl_header = register_sysctl_table(t->dn_dev_root_dir, 0); 285 t->sysctl_header = register_sysctl_table(t->dn_dev_root_dir);
286 if (t->sysctl_header == NULL) 286 if (t->sysctl_header == NULL)
287 kfree(t); 287 kfree(t);
288 else 288 else
diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
index 70a8cf2775df..52e40d7eb22d 100644
--- a/net/decnet/sysctl_net_decnet.c
+++ b/net/decnet/sysctl_net_decnet.c
@@ -491,7 +491,7 @@ static ctl_table dn_root_table[] = {
491 491
492void dn_register_sysctl(void) 492void dn_register_sysctl(void)
493{ 493{
494 dn_table_header = register_sysctl_table(dn_root_table, 0); 494 dn_table_header = register_sysctl_table(dn_root_table);
495} 495}
496 496
497void dn_unregister_sysctl(void) 497void dn_unregister_sysctl(void)
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 52db485a88f3..bf3eb2dc7662 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1606,7 +1606,7 @@ static void devinet_sysctl_register(struct in_device *in_dev,
1606 t->devinet_root_dir[0].child = t->devinet_proto_dir; 1606 t->devinet_root_dir[0].child = t->devinet_proto_dir;
1607 t->devinet_root_dir[0].de = NULL; 1607 t->devinet_root_dir[0].de = NULL;
1608 1608
1609 t->sysctl_header = register_sysctl_table(t->devinet_root_dir, 0); 1609 t->sysctl_header = register_sysctl_table(t->devinet_root_dir);
1610 if (!t->sysctl_header) 1610 if (!t->sysctl_header)
1611 goto free_procname; 1611 goto free_procname;
1612 1612
@@ -1640,7 +1640,7 @@ void __init devinet_init(void)
1640 rtnetlink_links[PF_INET] = inet_rtnetlink_table; 1640 rtnetlink_links[PF_INET] = inet_rtnetlink_table;
1641#ifdef CONFIG_SYSCTL 1641#ifdef CONFIG_SYSCTL
1642 devinet_sysctl.sysctl_header = 1642 devinet_sysctl.sysctl_header =
1643 register_sysctl_table(devinet_sysctl.devinet_root_dir, 0); 1643 register_sysctl_table(devinet_sysctl.devinet_root_dir);
1644 devinet_sysctl_register(NULL, &ipv4_devconf_dflt); 1644 devinet_sysctl_register(NULL, &ipv4_devconf_dflt);
1645#endif 1645#endif
1646} 1646}
diff --git a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c
index 8b08d9cdcbc8..b3050a6817e7 100644
--- a/net/ipv4/ipvs/ip_vs_ctl.c
+++ b/net/ipv4/ipvs/ip_vs_ctl.c
@@ -2359,7 +2359,7 @@ int ip_vs_control_init(void)
2359 proc_net_fops_create("ip_vs", 0, &ip_vs_info_fops); 2359 proc_net_fops_create("ip_vs", 0, &ip_vs_info_fops);
2360 proc_net_fops_create("ip_vs_stats",0, &ip_vs_stats_fops); 2360 proc_net_fops_create("ip_vs_stats",0, &ip_vs_stats_fops);
2361 2361
2362 sysctl_header = register_sysctl_table(vs_root_table, 0); 2362 sysctl_header = register_sysctl_table(vs_root_table);
2363 2363
2364 /* Initialize ip_vs_svc_table, ip_vs_svc_fwm_table, ip_vs_rtable */ 2364 /* Initialize ip_vs_svc_table, ip_vs_svc_fwm_table, ip_vs_rtable */
2365 for(idx = 0; idx < IP_VS_SVC_TAB_SIZE; idx++) { 2365 for(idx = 0; idx < IP_VS_SVC_TAB_SIZE; idx++) {
diff --git a/net/ipv4/ipvs/ip_vs_lblc.c b/net/ipv4/ipvs/ip_vs_lblc.c
index 76fd1fb91878..c801273cb881 100644
--- a/net/ipv4/ipvs/ip_vs_lblc.c
+++ b/net/ipv4/ipvs/ip_vs_lblc.c
@@ -583,7 +583,7 @@ static struct ip_vs_scheduler ip_vs_lblc_scheduler =
583static int __init ip_vs_lblc_init(void) 583static int __init ip_vs_lblc_init(void)
584{ 584{
585 INIT_LIST_HEAD(&ip_vs_lblc_scheduler.n_list); 585 INIT_LIST_HEAD(&ip_vs_lblc_scheduler.n_list);
586 sysctl_header = register_sysctl_table(lblc_root_table, 0); 586 sysctl_header = register_sysctl_table(lblc_root_table);
587 return register_ip_vs_scheduler(&ip_vs_lblc_scheduler); 587 return register_ip_vs_scheduler(&ip_vs_lblc_scheduler);
588} 588}
589 589
diff --git a/net/ipv4/ipvs/ip_vs_lblcr.c b/net/ipv4/ipvs/ip_vs_lblcr.c
index bf1e7f272b84..23f9b9e73c85 100644
--- a/net/ipv4/ipvs/ip_vs_lblcr.c
+++ b/net/ipv4/ipvs/ip_vs_lblcr.c
@@ -841,7 +841,7 @@ static struct ip_vs_scheduler ip_vs_lblcr_scheduler =
841static int __init ip_vs_lblcr_init(void) 841static int __init ip_vs_lblcr_init(void)
842{ 842{
843 INIT_LIST_HEAD(&ip_vs_lblcr_scheduler.n_list); 843 INIT_LIST_HEAD(&ip_vs_lblcr_scheduler.n_list);
844 sysctl_header = register_sysctl_table(lblcr_root_table, 0); 844 sysctl_header = register_sysctl_table(lblcr_root_table);
845#ifdef CONFIG_IP_VS_LBLCR_DEBUG 845#ifdef CONFIG_IP_VS_LBLCR_DEBUG
846 proc_net_create("ip_vs_lblcr", 0, ip_vs_lblcr_getinfo); 846 proc_net_create("ip_vs_lblcr", 0, ip_vs_lblcr_getinfo);
847#endif 847#endif
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
index 2c02ff03bc4c..e6942992b2f6 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
@@ -622,7 +622,7 @@ static int __init ip_conntrack_proto_sctp_init(void)
622 } 622 }
623 623
624#ifdef CONFIG_SYSCTL 624#ifdef CONFIG_SYSCTL
625 ip_ct_sysctl_header = register_sysctl_table(ip_ct_net_table, 0); 625 ip_ct_sysctl_header = register_sysctl_table(ip_ct_net_table);
626 if (ip_ct_sysctl_header == NULL) { 626 if (ip_ct_sysctl_header == NULL) {
627 ret = -ENOMEM; 627 ret = -ENOMEM;
628 printk("ip_conntrack_proto_sctp: can't register to sysctl.\n"); 628 printk("ip_conntrack_proto_sctp: can't register to sysctl.\n");
diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
index c7c1ec61b0f5..56b2f7546d1e 100644
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -848,7 +848,7 @@ static int __init ip_conntrack_standalone_init(void)
848 goto cleanup_proc_stat; 848 goto cleanup_proc_stat;
849 } 849 }
850#ifdef CONFIG_SYSCTL 850#ifdef CONFIG_SYSCTL
851 ip_ct_sysctl_header = register_sysctl_table(ip_ct_net_table, 0); 851 ip_ct_sysctl_header = register_sysctl_table(ip_ct_net_table);
852 if (ip_ct_sysctl_header == NULL) { 852 if (ip_ct_sysctl_header == NULL) {
853 printk("ip_conntrack: can't register to sysctl.\n"); 853 printk("ip_conntrack: can't register to sysctl.\n");
854 ret = -ENOMEM; 854 ret = -ENOMEM;
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index 68bf19f3b01c..a14798a850d7 100644
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@ -693,7 +693,7 @@ static int __init ip_queue_init(void)
693 } 693 }
694 694
695 register_netdevice_notifier(&ipq_dev_notifier); 695 register_netdevice_notifier(&ipq_dev_notifier);
696 ipq_sysctl_header = register_sysctl_table(ipq_root_table, 0); 696 ipq_sysctl_header = register_sysctl_table(ipq_root_table);
697 697
698 status = nf_register_queue_handler(PF_INET, &nfqh); 698 status = nf_register_queue_handler(PF_INET, &nfqh);
699 if (status < 0) { 699 if (status < 0) {
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 4702954bf0ac..34d80b4aaa04 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -4029,7 +4029,7 @@ static void addrconf_sysctl_register(struct inet6_dev *idev, struct ipv6_devconf
4029 t->addrconf_root_dir[0].child = t->addrconf_proto_dir; 4029 t->addrconf_root_dir[0].child = t->addrconf_proto_dir;
4030 t->addrconf_root_dir[0].de = NULL; 4030 t->addrconf_root_dir[0].de = NULL;
4031 4031
4032 t->sysctl_header = register_sysctl_table(t->addrconf_root_dir, 0); 4032 t->sysctl_header = register_sysctl_table(t->addrconf_root_dir);
4033 if (t->sysctl_header == NULL) 4033 if (t->sysctl_header == NULL)
4034 goto free_procname; 4034 goto free_procname;
4035 else 4035 else
@@ -4114,7 +4114,7 @@ int __init addrconf_init(void)
4114 rtnetlink_links[PF_INET6] = inet6_rtnetlink_table; 4114 rtnetlink_links[PF_INET6] = inet6_rtnetlink_table;
4115#ifdef CONFIG_SYSCTL 4115#ifdef CONFIG_SYSCTL
4116 addrconf_sysctl.sysctl_header = 4116 addrconf_sysctl.sysctl_header =
4117 register_sysctl_table(addrconf_sysctl.addrconf_root_dir, 0); 4117 register_sysctl_table(addrconf_sysctl.addrconf_root_dir);
4118 addrconf_sysctl_register(NULL, &ipv6_devconf_dflt); 4118 addrconf_sysctl_register(NULL, &ipv6_devconf_dflt);
4119#endif 4119#endif
4120 4120
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index 58847d3b61e5..fdb30a5916e5 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -683,7 +683,7 @@ static int __init ip6_queue_init(void)
683 } 683 }
684 684
685 register_netdevice_notifier(&ipq_dev_notifier); 685 register_netdevice_notifier(&ipq_dev_notifier);
686 ipq_sysctl_header = register_sysctl_table(ipq_root_table, 0); 686 ipq_sysctl_header = register_sysctl_table(ipq_root_table);
687 687
688 status = nf_register_queue_handler(PF_INET6, &nfqh); 688 status = nf_register_queue_handler(PF_INET6, &nfqh);
689 if (status < 0) { 689 if (status < 0) {
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index 25e8e7783fee..3fb44277207b 100644
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -107,7 +107,7 @@ static ctl_table ipv6_root_table[] = {
107 107
108void ipv6_sysctl_register(void) 108void ipv6_sysctl_register(void)
109{ 109{
110 ipv6_sysctl_header = register_sysctl_table(ipv6_root_table, 0); 110 ipv6_sysctl_header = register_sysctl_table(ipv6_root_table);
111} 111}
112 112
113void ipv6_sysctl_unregister(void) 113void ipv6_sysctl_unregister(void)
diff --git a/net/ipx/sysctl_net_ipx.c b/net/ipx/sysctl_net_ipx.c
index 0397b0985b79..0cf526450536 100644
--- a/net/ipx/sysctl_net_ipx.c
+++ b/net/ipx/sysctl_net_ipx.c
@@ -52,7 +52,7 @@ static struct ctl_table_header *ipx_table_header;
52 52
53void ipx_register_sysctl(void) 53void ipx_register_sysctl(void)
54{ 54{
55 ipx_table_header = register_sysctl_table(ipx_root_table, 0); 55 ipx_table_header = register_sysctl_table(ipx_root_table);
56} 56}
57 57
58void ipx_unregister_sysctl(void) 58void ipx_unregister_sysctl(void)
diff --git a/net/irda/irsysctl.c b/net/irda/irsysctl.c
index bb53ba0be585..2e968e7d8fea 100644
--- a/net/irda/irsysctl.c
+++ b/net/irda/irsysctl.c
@@ -274,7 +274,7 @@ static struct ctl_table_header *irda_table_header;
274 */ 274 */
275int __init irda_sysctl_register(void) 275int __init irda_sysctl_register(void)
276{ 276{
277 irda_table_header = register_sysctl_table(irda_root_table, 0); 277 irda_table_header = register_sysctl_table(irda_root_table);
278 if (!irda_table_header) 278 if (!irda_table_header)
279 return -ENOMEM; 279 return -ENOMEM;
280 280
diff --git a/net/llc/sysctl_net_llc.c b/net/llc/sysctl_net_llc.c
index bcec7e1eda95..46992d036017 100644
--- a/net/llc/sysctl_net_llc.c
+++ b/net/llc/sysctl_net_llc.c
@@ -116,7 +116,7 @@ static struct ctl_table_header *llc_table_header;
116 116
117int __init llc_sysctl_init(void) 117int __init llc_sysctl_init(void)
118{ 118{
119 llc_table_header = register_sysctl_table(llc_root_table, 0); 119 llc_table_header = register_sysctl_table(llc_root_table);
120 120
121 return llc_table_header ? 0 : -ENOMEM; 121 return llc_table_header ? 0 : -ENOMEM;
122} 122}
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index a0bba481d70d..b8586360e519 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -445,7 +445,7 @@ static int __init nf_conntrack_standalone_init(void)
445 proc_stat->owner = THIS_MODULE; 445 proc_stat->owner = THIS_MODULE;
446#endif 446#endif
447#ifdef CONFIG_SYSCTL 447#ifdef CONFIG_SYSCTL
448 nf_ct_sysctl_header = register_sysctl_table(nf_ct_net_table, 0); 448 nf_ct_sysctl_header = register_sysctl_table(nf_ct_net_table);
449 if (nf_ct_sysctl_header == NULL) { 449 if (nf_ct_sysctl_header == NULL) {
450 printk("nf_conntrack: can't register to sysctl.\n"); 450 printk("nf_conntrack: can't register to sysctl.\n");
451 ret = -ENOMEM; 451 ret = -ENOMEM;
diff --git a/net/netfilter/nf_sysctl.c b/net/netfilter/nf_sysctl.c
index 06ddddb2911f..ee34589e48a4 100644
--- a/net/netfilter/nf_sysctl.c
+++ b/net/netfilter/nf_sysctl.c
@@ -56,7 +56,7 @@ nf_register_sysctl_table(struct ctl_table *path, struct ctl_table *table)
56 path = path_dup(path, table); 56 path = path_dup(path, table);
57 if (path == NULL) 57 if (path == NULL)
58 return NULL; 58 return NULL;
59 header = register_sysctl_table(path, 0); 59 header = register_sysctl_table(path);
60 if (header == NULL) 60 if (header == NULL)
61 path_free(path, table); 61 path_free(path, table);
62 return header; 62 return header;
diff --git a/net/netrom/sysctl_net_netrom.c b/net/netrom/sysctl_net_netrom.c
index 6ca96a56663c..2ea68da01fb8 100644
--- a/net/netrom/sysctl_net_netrom.c
+++ b/net/netrom/sysctl_net_netrom.c
@@ -192,7 +192,7 @@ static ctl_table nr_root_table[] = {
192 192
193void __init nr_register_sysctl(void) 193void __init nr_register_sysctl(void)
194{ 194{
195 nr_table_header = register_sysctl_table(nr_root_table, 0); 195 nr_table_header = register_sysctl_table(nr_root_table);
196} 196}
197 197
198void nr_unregister_sysctl(void) 198void nr_unregister_sysctl(void)
diff --git a/net/rose/sysctl_net_rose.c b/net/rose/sysctl_net_rose.c
index b9210461a8b4..455b0555a669 100644
--- a/net/rose/sysctl_net_rose.c
+++ b/net/rose/sysctl_net_rose.c
@@ -160,7 +160,7 @@ static ctl_table rose_root_table[] = {
160 160
161void __init rose_register_sysctl(void) 161void __init rose_register_sysctl(void)
162{ 162{
163 rose_table_header = register_sysctl_table(rose_root_table, 0); 163 rose_table_header = register_sysctl_table(rose_root_table);
164} 164}
165 165
166void rose_unregister_sysctl(void) 166void rose_unregister_sysctl(void)
diff --git a/net/rxrpc/sysctl.c b/net/rxrpc/sysctl.c
index 0755ae028e43..884290754af7 100644
--- a/net/rxrpc/sysctl.c
+++ b/net/rxrpc/sysctl.c
@@ -97,7 +97,7 @@ static ctl_table rxrpc_dir_sysctl_table[] = {
97int rxrpc_sysctl_init(void) 97int rxrpc_sysctl_init(void)
98{ 98{
99#ifdef CONFIG_SYSCTL 99#ifdef CONFIG_SYSCTL
100 rxrpc_sysctl = register_sysctl_table(rxrpc_dir_sysctl_table, 0); 100 rxrpc_sysctl = register_sysctl_table(rxrpc_dir_sysctl_table);
101 if (!rxrpc_sysctl) 101 if (!rxrpc_sysctl)
102 return -ENOMEM; 102 return -ENOMEM;
103#endif /* CONFIG_SYSCTL */ 103#endif /* CONFIG_SYSCTL */
diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
index 633cd178654b..e2c679baf912 100644
--- a/net/sctp/sysctl.c
+++ b/net/sctp/sysctl.c
@@ -254,7 +254,7 @@ static struct ctl_table_header * sctp_sysctl_header;
254/* Sysctl registration. */ 254/* Sysctl registration. */
255void sctp_sysctl_register(void) 255void sctp_sysctl_register(void)
256{ 256{
257 sctp_sysctl_header = register_sysctl_table(sctp_root_table, 0); 257 sctp_sysctl_header = register_sysctl_table(sctp_root_table);
258} 258}
259 259
260/* Sysctl deregistration. */ 260/* Sysctl deregistration. */
diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c
index 1169798bf271..738db32a287d 100644
--- a/net/sunrpc/sysctl.c
+++ b/net/sunrpc/sysctl.c
@@ -36,7 +36,7 @@ void
36rpc_register_sysctl(void) 36rpc_register_sysctl(void)
37{ 37{
38 if (!sunrpc_table_header) 38 if (!sunrpc_table_header)
39 sunrpc_table_header = register_sysctl_table(sunrpc_table, 0); 39 sunrpc_table_header = register_sysctl_table(sunrpc_table);
40} 40}
41 41
42void 42void
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 5a9f6d840e82..a5a32029e728 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1636,7 +1636,7 @@ int init_socket_xprt(void)
1636{ 1636{
1637#ifdef RPC_DEBUG 1637#ifdef RPC_DEBUG
1638 if (!sunrpc_table_header) 1638 if (!sunrpc_table_header)
1639 sunrpc_table_header = register_sysctl_table(sunrpc_table, 0); 1639 sunrpc_table_header = register_sysctl_table(sunrpc_table);
1640#endif 1640#endif
1641 1641
1642 return 0; 1642 return 0;
diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
index 690ffa5d5bfb..eb0bd57ebada 100644
--- a/net/unix/sysctl_net_unix.c
+++ b/net/unix/sysctl_net_unix.c
@@ -50,7 +50,7 @@ static struct ctl_table_header * unix_sysctl_header;
50 50
51void unix_sysctl_register(void) 51void unix_sysctl_register(void)
52{ 52{
53 unix_sysctl_header = register_sysctl_table(unix_root_table, 0); 53 unix_sysctl_header = register_sysctl_table(unix_root_table);
54} 54}
55 55
56void unix_sysctl_unregister(void) 56void unix_sysctl_unregister(void)
diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c
index 68300d4c19cc..a59b77f18234 100644
--- a/net/x25/sysctl_net_x25.c
+++ b/net/x25/sysctl_net_x25.c
@@ -106,7 +106,7 @@ static struct ctl_table x25_root_table[] = {
106 106
107void __init x25_register_sysctl(void) 107void __init x25_register_sysctl(void)
108{ 108{
109 x25_table_header = register_sysctl_table(x25_root_table, 0); 109 x25_table_header = register_sysctl_table(x25_root_table);
110} 110}
111 111
112void x25_unregister_sysctl(void) 112void x25_unregister_sysctl(void)