sysctl: remove "struct file *" argument of ->proc_handler
It's unused. It isn't needed -- read or write flag is already passed and sysctl shouldn't care about the rest. It _was_ used in two places at arch/frv for some reason. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: David Howells <dhowells@redhat.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: "David S. Miller" <davem@davemloft.net> Cc: James Morris <jmorris@namei.org> 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
c0d0787b6d
commit
8d65af789f
@ -1735,7 +1735,7 @@ static void ndisc_warn_deprecated_sysctl(struct ctl_table *ctl,
|
||||
}
|
||||
}
|
||||
|
||||
int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, struct file * filp, void __user *buffer, size_t *lenp, loff_t *ppos)
|
||||
int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, void __user *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
struct net_device *dev = ctl->extra1;
|
||||
struct inet6_dev *idev;
|
||||
@ -1746,16 +1746,16 @@ int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, struct file * f
|
||||
ndisc_warn_deprecated_sysctl(ctl, "syscall", dev ? dev->name : "default");
|
||||
|
||||
if (strcmp(ctl->procname, "retrans_time") == 0)
|
||||
ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
|
||||
ret = proc_dointvec(ctl, write, buffer, lenp, ppos);
|
||||
|
||||
else if (strcmp(ctl->procname, "base_reachable_time") == 0)
|
||||
ret = proc_dointvec_jiffies(ctl, write,
|
||||
filp, buffer, lenp, ppos);
|
||||
buffer, lenp, ppos);
|
||||
|
||||
else if ((strcmp(ctl->procname, "retrans_time_ms") == 0) ||
|
||||
(strcmp(ctl->procname, "base_reachable_time_ms") == 0))
|
||||
ret = proc_dointvec_ms_jiffies(ctl, write,
|
||||
filp, buffer, lenp, ppos);
|
||||
buffer, lenp, ppos);
|
||||
else
|
||||
ret = -1;
|
||||
|
||||
|
Reference in New Issue
Block a user