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
@@ -1270,10 +1270,10 @@ static void inet_forward_change(struct net *net)
|
||||
}
|
||||
|
||||
static int devinet_conf_proc(ctl_table *ctl, int write,
|
||||
struct file *filp, void __user *buffer,
|
||||
void __user *buffer,
|
||||
size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
int ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
|
||||
int ret = proc_dointvec(ctl, write, buffer, lenp, ppos);
|
||||
|
||||
if (write) {
|
||||
struct ipv4_devconf *cnf = ctl->extra1;
|
||||
@@ -1342,12 +1342,12 @@ static int devinet_conf_sysctl(ctl_table *table,
|
||||
}
|
||||
|
||||
static int devinet_sysctl_forward(ctl_table *ctl, int write,
|
||||
struct file *filp, void __user *buffer,
|
||||
void __user *buffer,
|
||||
size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
int *valp = ctl->data;
|
||||
int val = *valp;
|
||||
int ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
|
||||
int ret = proc_dointvec(ctl, write, buffer, lenp, ppos);
|
||||
|
||||
if (write && *valp != val) {
|
||||
struct net *net = ctl->extra2;
|
||||
@@ -1372,12 +1372,12 @@ static int devinet_sysctl_forward(ctl_table *ctl, int write,
|
||||
}
|
||||
|
||||
int ipv4_doint_and_flush(ctl_table *ctl, int write,
|
||||
struct file *filp, void __user *buffer,
|
||||
void __user *buffer,
|
||||
size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
int *valp = ctl->data;
|
||||
int val = *valp;
|
||||
int ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
|
||||
int ret = proc_dointvec(ctl, write, buffer, lenp, ppos);
|
||||
struct net *net = ctl->extra2;
|
||||
|
||||
if (write && *valp != val)
|
||||
|
Reference in New Issue
Block a user