aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/devinet.c
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/ipv4/devinet.c
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/ipv4/devinet.c')
-rw-r--r--net/ipv4/devinet.c4
1 files changed, 2 insertions, 2 deletions
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}