mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
[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 <[email protected]> Acked-by: Ralf Baechle <[email protected]> Acked-by: Martin Schwidefsky <[email protected]> Cc: Russell King <[email protected]> Cc: David Howells <[email protected]> Cc: "Luck, Tony" <[email protected]> Cc: Ralf Baechle <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Corey Minyard <[email protected]> Cc: Neil Brown <[email protected]> Cc: "John W. Linville" <[email protected]> Cc: James Bottomley <[email protected]> Cc: Jan Kara <[email protected]> Cc: Trond Myklebust <[email protected]> Cc: Mark Fasheh <[email protected]> Cc: David Chinner <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Patrick McHardy <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
ae83681026
commit
0b4d414714
68 changed files with 75 additions and 80 deletions
|
|
@ -3553,7 +3553,7 @@ static void cdrom_sysctl_register(void)
|
|||
if (initialized == 1)
|
||||
return;
|
||||
|
||||
cdrom_sysctl_header = register_sysctl_table(cdrom_root_table, 0);
|
||||
cdrom_sysctl_header = register_sysctl_table(cdrom_root_table);
|
||||
|
||||
/* set the defaults */
|
||||
cdrom_sysctl_settings.autoclose = autoclose;
|
||||
|
|
|
|||
|
|
@ -1018,7 +1018,7 @@ static int __init hpet_init(void)
|
|||
if (result < 0)
|
||||
return -ENODEV;
|
||||
|
||||
sysctl_header = register_sysctl_table(dev_root, 0);
|
||||
sysctl_header = register_sysctl_table(dev_root);
|
||||
|
||||
result = acpi_bus_register_driver(&hpet_acpi_driver);
|
||||
if (result < 0) {
|
||||
|
|
|
|||
|
|
@ -686,7 +686,7 @@ static int ipmi_poweroff_init (void)
|
|||
printk(KERN_INFO PFX "Power cycle is enabled.\n");
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
ipmi_table_header = register_sysctl_table(ipmi_root_table, 0);
|
||||
ipmi_table_header = register_sysctl_table(ipmi_root_table);
|
||||
if (!ipmi_table_header) {
|
||||
printk(KERN_ERR PFX "Unable to register powercycle sysctl\n");
|
||||
rv = -ENOMEM;
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@ static struct ctl_table_header *sysctl_header;
|
|||
|
||||
static int __init init_sysctl(void)
|
||||
{
|
||||
sysctl_header = register_sysctl_table(dev_root, 0);
|
||||
sysctl_header = register_sysctl_table(dev_root);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ int __init mac_hid_init(void)
|
|||
return err;
|
||||
|
||||
#if defined(CONFIG_SYSCTL)
|
||||
mac_hid_sysctl_header = register_sysctl_table(mac_hid_root_dir, 0);
|
||||
mac_hid_sysctl_header = register_sysctl_table(mac_hid_root_dir);
|
||||
#endif /* CONFIG_SYSCTL */
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -5581,7 +5581,7 @@ static int __init md_init(void)
|
|||
md_probe, NULL, NULL);
|
||||
|
||||
register_reboot_notifier(&md_notifier);
|
||||
raid_table_header = register_sysctl_table(raid_root_table, 0);
|
||||
raid_table_header = register_sysctl_table(raid_root_table);
|
||||
|
||||
md_geninit();
|
||||
return (0);
|
||||
|
|
|
|||
|
|
@ -1244,7 +1244,7 @@ int __init init_arlan_proc(void)
|
|||
return 0;
|
||||
for (i = 0; i < MAX_ARLANS && arlan_device[i]; i++)
|
||||
arlan_table[i].ctl_name = i + 1;
|
||||
arlan_device_sysctl_header = register_sysctl_table(arlan_root_table, 0);
|
||||
arlan_device_sysctl_header = register_sysctl_table(arlan_root_table);
|
||||
if (!arlan_device_sysctl_header)
|
||||
return -1;
|
||||
|
||||
|
|
|
|||
|
|
@ -518,7 +518,7 @@ int parport_proc_register(struct parport *port)
|
|||
t->parport_dir[0].child = t->port_dir;
|
||||
t->dev_dir[0].child = t->parport_dir;
|
||||
|
||||
t->sysctl_header = register_sysctl_table(t->dev_dir, 0);
|
||||
t->sysctl_header = register_sysctl_table(t->dev_dir);
|
||||
if (t->sysctl_header == NULL) {
|
||||
kfree(t);
|
||||
t = NULL;
|
||||
|
|
@ -574,7 +574,7 @@ int parport_device_proc_register(struct pardevice *device)
|
|||
t->device_dir[0].child = t->vars;
|
||||
t->vars[0].data = &device->timeslice;
|
||||
|
||||
t->sysctl_header = register_sysctl_table(t->dev_dir, 0);
|
||||
t->sysctl_header = register_sysctl_table(t->dev_dir);
|
||||
if (t->sysctl_header == NULL) {
|
||||
kfree(t);
|
||||
t = NULL;
|
||||
|
|
@ -597,7 +597,7 @@ int parport_device_proc_unregister(struct pardevice *device)
|
|||
static int __init parport_default_proc_register(void)
|
||||
{
|
||||
parport_default_sysctl_table.sysctl_header =
|
||||
register_sysctl_table(parport_default_sysctl_table.dev_dir, 0);
|
||||
register_sysctl_table(parport_default_sysctl_table.dev_dir);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ static struct ctl_table_header *scsi_table_header;
|
|||
|
||||
int __init scsi_init_sysctl(void)
|
||||
{
|
||||
scsi_table_header = register_sysctl_table(scsi_root_table, 0);
|
||||
scsi_table_header = register_sysctl_table(scsi_root_table);
|
||||
if (!scsi_table_header)
|
||||
return -ENOMEM;
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue