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
@@ -3982,7 +3982,6 @@ int addrconf_sysctl_forward(ctl_table *ctl, int write, struct file * filp,
|
||||
}
|
||||
|
||||
static int addrconf_sysctl_forward_strategy(ctl_table *table,
|
||||
int __user *name, int nlen,
|
||||
void __user *oldval,
|
||||
size_t __user *oldlenp,
|
||||
void __user *newval, size_t newlen)
|
||||
|
@@ -1730,9 +1730,8 @@ int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, struct file * f
|
||||
return ret;
|
||||
}
|
||||
|
||||
int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name,
|
||||
int nlen, void __user *oldval,
|
||||
size_t __user *oldlenp,
|
||||
int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl,
|
||||
void __user *oldval, size_t __user *oldlenp,
|
||||
void __user *newval, size_t newlen)
|
||||
{
|
||||
struct net_device *dev = ctl->extra1;
|
||||
@@ -1745,13 +1744,11 @@ int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name,
|
||||
|
||||
switch (ctl->ctl_name) {
|
||||
case NET_NEIGH_REACHABLE_TIME:
|
||||
ret = sysctl_jiffies(ctl, name, nlen,
|
||||
oldval, oldlenp, newval, newlen);
|
||||
ret = sysctl_jiffies(ctl, oldval, oldlenp, newval, newlen);
|
||||
break;
|
||||
case NET_NEIGH_RETRANS_TIME_MS:
|
||||
case NET_NEIGH_REACHABLE_TIME_MS:
|
||||
ret = sysctl_ms_jiffies(ctl, name, nlen,
|
||||
oldval, oldlenp, newval, newlen);
|
||||
ret = sysctl_ms_jiffies(ctl, oldval, oldlenp, newval, newlen);
|
||||
break;
|
||||
default:
|
||||
ret = 0;
|
||||
|
Reference in New Issue
Block a user