sysctl: simplify ->strategy
name and nlen parameters passed to ->strategy hook are unused, remove them. In general ->strategy hook should know what it's doing, and don't do something tricky for which, say, pointer to original userspace array may be needed (name). Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Acked-by: David S. Miller <davem@davemloft.net> [ networking bits ] Cc: Ralf Baechle <ralf@linux-mips.org> Cc: David Howells <dhowells@redhat.com> Cc: Matt Mackall <mpm@selenic.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
f40cbaa5b0
commit
f221e726bf
@@ -38,14 +38,13 @@
|
||||
#endif
|
||||
|
||||
/* Strategy function to write EEPROM after changing string entry */
|
||||
int sysctl_lasatstring(ctl_table *table, int *name, int nlen,
|
||||
int sysctl_lasatstring(ctl_table *table,
|
||||
void *oldval, size_t *oldlenp,
|
||||
void *newval, size_t newlen)
|
||||
{
|
||||
int r;
|
||||
|
||||
r = sysctl_string(table, name,
|
||||
nlen, oldval, oldlenp, newval, newlen);
|
||||
r = sysctl_string(table, oldval, oldlenp, newval, newlen);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@@ -113,13 +112,13 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,
|
||||
#endif
|
||||
|
||||
/* Sysctl for setting the IP addresses */
|
||||
int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen,
|
||||
int sysctl_lasat_intvec(ctl_table *table,
|
||||
void *oldval, size_t *oldlenp,
|
||||
void *newval, size_t newlen)
|
||||
{
|
||||
int r;
|
||||
|
||||
r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
|
||||
r = sysctl_intvec(table, oldval, oldlenp, newval, newlen);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@@ -131,7 +130,7 @@ int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen,
|
||||
|
||||
#ifdef CONFIG_DS1603
|
||||
/* Same for RTC */
|
||||
int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,
|
||||
int sysctl_lasat_rtc(ctl_table *table,
|
||||
void *oldval, size_t *oldlenp,
|
||||
void *newval, size_t newlen)
|
||||
{
|
||||
@@ -140,7 +139,7 @@ int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,
|
||||
rtctmp = read_persistent_clock();
|
||||
if (rtctmp < 0)
|
||||
rtctmp = 0;
|
||||
r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
|
||||
r = sysctl_intvec(table, oldval, oldlenp, newval, newlen);
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (newval && newlen)
|
||||
@@ -211,13 +210,13 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
|
||||
}
|
||||
#endif
|
||||
|
||||
static int sysctl_lasat_prid(ctl_table *table, int *name, int nlen,
|
||||
static int sysctl_lasat_prid(ctl_table *table,
|
||||
void *oldval, size_t *oldlenp,
|
||||
void *newval, size_t newlen)
|
||||
{
|
||||
int r;
|
||||
|
||||
r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
|
||||
r = sysctl_intvec(table, oldval, oldlenp, newval, newlen);
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (newval && newlen) {
|
||||
|
Reference in New Issue
Block a user