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
@@ -1496,14 +1496,14 @@ static int ip_vs_zero_all(void)
|
||||
|
||||
|
||||
static int
|
||||
proc_do_defense_mode(ctl_table *table, int write, struct file * filp,
|
||||
proc_do_defense_mode(ctl_table *table, int write,
|
||||
void __user *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
int *valp = table->data;
|
||||
int val = *valp;
|
||||
int rc;
|
||||
|
||||
rc = proc_dointvec(table, write, filp, buffer, lenp, ppos);
|
||||
rc = proc_dointvec(table, write, buffer, lenp, ppos);
|
||||
if (write && (*valp != val)) {
|
||||
if ((*valp < 0) || (*valp > 3)) {
|
||||
/* Restore the correct value */
|
||||
@@ -1517,7 +1517,7 @@ proc_do_defense_mode(ctl_table *table, int write, struct file * filp,
|
||||
|
||||
|
||||
static int
|
||||
proc_do_sync_threshold(ctl_table *table, int write, struct file *filp,
|
||||
proc_do_sync_threshold(ctl_table *table, int write,
|
||||
void __user *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
int *valp = table->data;
|
||||
@@ -1527,7 +1527,7 @@ proc_do_sync_threshold(ctl_table *table, int write, struct file *filp,
|
||||
/* backup the value first */
|
||||
memcpy(val, valp, sizeof(val));
|
||||
|
||||
rc = proc_dointvec(table, write, filp, buffer, lenp, ppos);
|
||||
rc = proc_dointvec(table, write, buffer, lenp, ppos);
|
||||
if (write && (valp[0] < 0 || valp[1] < 0 || valp[0] >= valp[1])) {
|
||||
/* Restore the correct value */
|
||||
memcpy(valp, val, sizeof(val));
|
||||
|
||||
@@ -226,7 +226,7 @@ static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
|
||||
static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
|
||||
static struct ctl_table_header *nf_log_dir_header;
|
||||
|
||||
static int nf_log_proc_dostring(ctl_table *table, int write, struct file *filp,
|
||||
static int nf_log_proc_dostring(ctl_table *table, int write,
|
||||
void __user *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
const struct nf_logger *logger;
|
||||
@@ -260,7 +260,7 @@ static int nf_log_proc_dostring(ctl_table *table, int write, struct file *filp,
|
||||
table->data = "NONE";
|
||||
else
|
||||
table->data = logger->name;
|
||||
r = proc_dostring(table, write, filp, buffer, lenp, ppos);
|
||||
r = proc_dostring(table, write, buffer, lenp, ppos);
|
||||
mutex_unlock(&nf_log_mutex);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user