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>
此提交包含在:
@@ -2,6 +2,7 @@
|
||||
#define _CODA_INT_
|
||||
|
||||
struct dentry;
|
||||
struct file;
|
||||
|
||||
extern struct file_system_type coda_fs_type;
|
||||
extern unsigned long coda_timeout;
|
||||
|
@@ -63,9 +63,9 @@ static void drop_slab(void)
|
||||
}
|
||||
|
||||
int drop_caches_sysctl_handler(ctl_table *table, int write,
|
||||
struct file *file, void __user *buffer, size_t *length, loff_t *ppos)
|
||||
void __user *buffer, size_t *length, loff_t *ppos)
|
||||
{
|
||||
proc_dointvec_minmax(table, write, file, buffer, length, ppos);
|
||||
proc_dointvec_minmax(table, write, buffer, length, ppos);
|
||||
if (write) {
|
||||
if (sysctl_drop_caches & 1)
|
||||
drop_pagecache();
|
||||
|
@@ -74,14 +74,14 @@ EXPORT_SYMBOL_GPL(get_max_files);
|
||||
* Handle nr_files sysctl
|
||||
*/
|
||||
#if defined(CONFIG_SYSCTL) && defined(CONFIG_PROC_FS)
|
||||
int proc_nr_files(ctl_table *table, int write, struct file *filp,
|
||||
int proc_nr_files(ctl_table *table, int write,
|
||||
void __user *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
files_stat.nr_files = get_nr_files();
|
||||
return proc_dointvec(table, write, filp, buffer, lenp, ppos);
|
||||
return proc_dointvec(table, write, buffer, lenp, ppos);
|
||||
}
|
||||
#else
|
||||
int proc_nr_files(ctl_table *table, int write, struct file *filp,
|
||||
int proc_nr_files(ctl_table *table, int write,
|
||||
void __user *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
return -ENOSYS;
|
||||
|
@@ -153,7 +153,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
|
||||
|
||||
/* careful: calling conventions are nasty here */
|
||||
res = count;
|
||||
error = table->proc_handler(table, write, filp, buf, &res, ppos);
|
||||
error = table->proc_handler(table, write, buf, &res, ppos);
|
||||
if (!error)
|
||||
error = res;
|
||||
out:
|
||||
|
@@ -26,7 +26,6 @@ STATIC int
|
||||
xfs_stats_clear_proc_handler(
|
||||
ctl_table *ctl,
|
||||
int write,
|
||||
struct file *filp,
|
||||
void __user *buffer,
|
||||
size_t *lenp,
|
||||
loff_t *ppos)
|
||||
@@ -34,7 +33,7 @@ xfs_stats_clear_proc_handler(
|
||||
int c, ret, *valp = ctl->data;
|
||||
__uint32_t vn_active;
|
||||
|
||||
ret = proc_dointvec_minmax(ctl, write, filp, buffer, lenp, ppos);
|
||||
ret = proc_dointvec_minmax(ctl, write, buffer, lenp, ppos);
|
||||
|
||||
if (!ret && write && *valp) {
|
||||
printk("XFS Clearing xfsstats\n");
|
||||
|
新增問題並參考
封鎖使用者