apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

sysctl: remove "struct file *" argument of ->proc_handler

Browse Source 
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:
Alexey Dobriyan
2009-09-23 15:57:19 -07:00
committed by Linus Torvalds
parent c0d0787b6d
commit 8d65af789f
60 changed files with 239 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/frv/kernel/pm.c
+7 -7
View File
@@ -150,7 +150,7 @@ static int user_atoi(char __user *ubuf, size_t len)
/* /*
* Send us to sleep. * Send us to sleep.
*/ */
static int sysctl_pm_do_suspend(ctl_table *ctl, int write, struct file *filp, static int sysctl_pm_do_suspend(ctl_table *ctl, int write,
void __user *buffer, size_t *lenp, loff_t *fpos) void __user *buffer, size_t *lenp, loff_t *fpos)
{ {
int retval, mode; int retval, mode;
@@ -198,13 +198,13 @@ static int try_set_cmode(int new_cmode)
} }
static int cmode_procctl(ctl_table *ctl, int write, struct file *filp, static int cmode_procctl(ctl_table *ctl, int write,
void __user *buffer, size_t *lenp, loff_t *fpos) void __user *buffer, size_t *lenp, loff_t *fpos)
{ {
int new_cmode; int new_cmode;
if (!write) if (!write)
return proc_dointvec(ctl, write, filp, buffer, lenp, fpos); return proc_dointvec(ctl, write, buffer, lenp, fpos);
new_cmode = user_atoi(buffer, *lenp); new_cmode = user_atoi(buffer, *lenp);
@@ -301,13 +301,13 @@ static int try_set_cm(int new_cm)
return 0; return 0;
} }
static int p0_procctl(ctl_table *ctl, int write, struct file *filp, static int p0_procctl(ctl_table *ctl, int write,
void __user *buffer, size_t *lenp, loff_t *fpos) void __user *buffer, size_t *lenp, loff_t *fpos)
{ {
int new_p0; int new_p0;
if (!write) if (!write)
return proc_dointvec(ctl, write, filp, buffer, lenp, fpos); return proc_dointvec(ctl, write, buffer, lenp, fpos);
new_p0 = user_atoi(buffer, *lenp); new_p0 = user_atoi(buffer, *lenp);
@@ -345,13 +345,13 @@ static int p0_sysctl(ctl_table *table,
return 1; return 1;
} }
static int cm_procctl(ctl_table *ctl, int write, struct file *filp, static int cm_procctl(ctl_table *ctl, int write,
void __user *buffer, size_t *lenp, loff_t *fpos) void __user *buffer, size_t *lenp, loff_t *fpos)
{ {
int new_cm; int new_cm;
if (!write) if (!write)
return proc_dointvec(ctl, write, filp, buffer, lenp, fpos); return proc_dointvec(ctl, write, buffer, lenp, fpos);
new_cm = user_atoi(buffer, *lenp); new_cm = user_atoi(buffer, *lenp);
arch/mips/lasat/sysctl.c
+9 -9
View File
@@ -56,12 +56,12 @@ int sysctl_lasatstring(ctl_table *table,
/* And the same for proc */ /* And the same for proc */
int proc_dolasatstring(ctl_table *table, int write, struct file *filp, int proc_dolasatstring(ctl_table *table, int write,
void *buffer, size_t *lenp, loff_t *ppos) void *buffer, size_t *lenp, loff_t *ppos)
{ {
int r; int r;
r = proc_dostring(table, write, filp, buffer, lenp, ppos); r = proc_dostring(table, write, buffer, lenp, ppos);
if ((!write) || r) if ((!write) || r)
return r; return r;
@@ -71,12 +71,12 @@ int proc_dolasatstring(ctl_table *table, int write, struct file *filp,
} }
/* proc function to write EEPROM after changing int entry */ /* proc function to write EEPROM after changing int entry */
int proc_dolasatint(ctl_table *table, int write, struct file *filp, int proc_dolasatint(ctl_table *table, int write,
void *buffer, size_t *lenp, loff_t *ppos) void *buffer, size_t *lenp, loff_t *ppos)
{ {
int r; int r;
r = proc_dointvec(table, write, filp, buffer, lenp, ppos); r = proc_dointvec(table, write, buffer, lenp, ppos);
if ((!write) || r) if ((!write) || r)
return r; return r;
@@ -89,7 +89,7 @@ int proc_dolasatint(ctl_table *table, int write, struct file *filp,
static int rtctmp; static int rtctmp;
/* proc function to read/write RealTime Clock */ /* proc function to read/write RealTime Clock */
int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, int proc_dolasatrtc(ctl_table *table, int write,
void *buffer, size_t *lenp, loff_t *ppos) void *buffer, size_t *lenp, loff_t *ppos)
{ {
struct timespec ts; struct timespec ts;
@@ -102,7 +102,7 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,
if (rtctmp < 0) if (rtctmp < 0)
rtctmp = 0; rtctmp = 0;
} }
r = proc_dointvec(table, write, filp, buffer, lenp, ppos); r = proc_dointvec(table, write, buffer, lenp, ppos);
if (r) if (r)
return r; return r;
@@ -154,7 +154,7 @@ int sysctl_lasat_rtc(ctl_table *table,
#endif #endif
#ifdef CONFIG_INET #ifdef CONFIG_INET
int proc_lasat_ip(ctl_table *table, int write, struct file *filp, int proc_lasat_ip(ctl_table *table, int write,
void *buffer, size_t *lenp, loff_t *ppos) void *buffer, size_t *lenp, loff_t *ppos)
{ {
unsigned int ip; unsigned int ip;
@@ -231,12 +231,12 @@ static int sysctl_lasat_prid(ctl_table *table,
return 0; return 0;
} }
int proc_lasat_prid(ctl_table *table, int write, struct file *filp, int proc_lasat_prid(ctl_table *table, int write,
void *buffer, size_t *lenp, loff_t *ppos) void *buffer, size_t *lenp, loff_t *ppos)
{ {
int r; int r;
r = proc_dointvec(table, write, filp, buffer, lenp, ppos); r = proc_dointvec(table, write, buffer, lenp, ppos);
if (r < 0) if (r < 0)
return r; return r;
if (write) { if (write) {
arch/s390/appldata/appldata_base.c
+4 -5
View File
@@ -50,10 +50,9 @@ static struct platform_device *appldata_pdev;
* /proc entries (sysctl) * /proc entries (sysctl)
*/ */
static const char appldata_proc_name[APPLDATA_PROC_NAME_LENGTH] = "appldata"; static const char appldata_proc_name[APPLDATA_PROC_NAME_LENGTH] = "appldata";
static int appldata_timer_handler(ctl_table *ctl, int write, struct file *filp, static int appldata_timer_handler(ctl_table *ctl, int write,
void __user *buffer, size_t *lenp, loff_t *ppos); void __user *buffer, size_t *lenp, loff_t *ppos);
static int appldata_interval_handler(ctl_table *ctl, int write, static int appldata_interval_handler(ctl_table *ctl, int write,
struct file *filp,
void __user *buffer, void __user *buffer,
size_t *lenp, loff_t *ppos); size_t *lenp, loff_t *ppos);
@@ -247,7 +246,7 @@ __appldata_vtimer_setup(int cmd)
* Start/Stop timer, show status of timer (0 = not active, 1 = active) * Start/Stop timer, show status of timer (0 = not active, 1 = active)
*/ */
static int static int
appldata_timer_handler(ctl_table *ctl, int write, struct file *filp, appldata_timer_handler(ctl_table *ctl, int write,
void __user *buffer, size_t *lenp, loff_t *ppos) void __user *buffer, size_t *lenp, loff_t *ppos)
{ {
int len; int len;
@@ -289,7 +288,7 @@ out:
* current timer interval. * current timer interval.
*/ */
static int static int
appldata_interval_handler(ctl_table *ctl, int write, struct file *filp, appldata_interval_handler(ctl_table *ctl, int write,
void __user *buffer, size_t *lenp, loff_t *ppos) void __user *buffer, size_t *lenp, loff_t *ppos)
{ {
int len, interval; int len, interval;
@@ -335,7 +334,7 @@ out:
* monitoring (0 = not in process, 1 = in process) * monitoring (0 = not in process, 1 = in process)
*/ */
static int static int
appldata_generic_handler(ctl_table *ctl, int write, struct file *filp, appldata_generic_handler(ctl_table *ctl, int write,
void __user *buffer, size_t *lenp, loff_t *ppos) void __user *buffer, size_t *lenp, loff_t *ppos)
{ {
struct appldata_ops *ops = NULL, *tmp_ops; struct appldata_ops *ops = NULL, *tmp_ops;
arch/s390/kernel/debug.c
+2 -2
View File
@@ -881,11 +881,11 @@ static int debug_active=1;
* if debug_active is already off * if debug_active is already off
*/ */
static int static int
s390dbf_procactive(ctl_table *table, int write, struct file *filp, s390dbf_procactive(ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos) void __user *buffer, size_t *lenp, loff_t *ppos)
{ {
if (!write || debug_stoppable || !debug_active) if (!write || debug_stoppable || !debug_active)
return proc_dointvec(table, write, filp, buffer, lenp, ppos); return proc_dointvec(table, write, buffer, lenp, ppos);
else else
return 0; return 0;
} }
arch/s390/mm/cmm.c
+2 -2
View File
@@ -262,7 +262,7 @@ cmm_skip_blanks(char *cp, char **endp)
static struct ctl_table cmm_table[]; static struct ctl_table cmm_table[];
static int static int
cmm_pages_handler(ctl_table *ctl, int write, struct file *filp, cmm_pages_handler(ctl_table *ctl, int write,
void __user *buffer, size_t *lenp, loff_t *ppos) void __user *buffer, size_t *lenp, loff_t *ppos)
{ {
char buf[16], *p; char buf[16], *p;
@@ -303,7 +303,7 @@ cmm_pages_handler(ctl_table *ctl, int write, struct file *filp,
} }
static int static int
cmm_timeout_handler(ctl_table *ctl, int write, struct file *filp, cmm_timeout_handler(ctl_table *ctl, int write,
void __user *buffer, size_t *lenp, loff_t *ppos) void __user *buffer, size_t *lenp, loff_t *ppos)
{ {
char buf[64], *p; char buf[64], *p;
arch/x86/include/asm/nmi.h
+1 -2
View File
@@ -40,8 +40,7 @@ extern unsigned int nmi_watchdog;
#define NMI_INVALID 3 #define NMI_INVALID 3
struct ctl_table; struct ctl_table;
struct file; extern int proc_nmi_enabled(struct ctl_table *, int ,
extern int proc_nmi_enabled(struct ctl_table *, int , struct file *,
void __user *, size_t *, loff_t *); void __user *, size_t *, loff_t *);
extern int unknown_nmi_panic; extern int unknown_nmi_panic;
arch/x86/kernel/apic/nmi.c
+2 -2
View File
@@ -508,14 +508,14 @@ static int unknown_nmi_panic_callback(struct pt_regs *regs, int cpu)
/* /*
* proc handler for /proc/sys/kernel/nmi * proc handler for /proc/sys/kernel/nmi
*/ */
int proc_nmi_enabled(struct ctl_table *table, int write, struct file *file, int proc_nmi_enabled(struct ctl_table *table, int write,
void __user *buffer, size_t *length, loff_t *ppos) void __user *buffer, size_t *length, loff_t *ppos)
{ {
int old_state; int old_state;
nmi_watchdog_enabled = (atomic_read(&nmi_active) > 0) ? 1 : 0; nmi_watchdog_enabled = (atomic_read(&nmi_active) > 0) ? 1 : 0;
old_state = nmi_watchdog_enabled; old_state = nmi_watchdog_enabled;
proc_dointvec(table, write, file, buffer, length, ppos); proc_dointvec(table, write, buffer, length, ppos);
if (!!old_state == !!nmi_watchdog_enabled) if (!!old_state == !!nmi_watchdog_enabled)
return 0; return 0;
arch/x86/kernel/vsyscall_64.c
+1 -9
View File
@@ -228,19 +228,11 @@ static long __vsyscall(3) venosys_1(void)
} }
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
static int
vsyscall_sysctl_change(ctl_table *ctl, int write, struct file * filp,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
return proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
}
static ctl_table kernel_table2[] = { static ctl_table kernel_table2[] = {
{ .procname = "vsyscall64", { .procname = "vsyscall64",
.data = &vsyscall_gtod_data.sysctl_enabled, .maxlen = sizeof(int), .data = &vsyscall_gtod_data.sysctl_enabled, .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = vsyscall_sysctl_change }, .proc_handler = proc_dointvec },
{} {}
}; };
drivers/cdrom/cdrom.c
+4 -4
View File
@@ -3412,7 +3412,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
return 0; return 0;
} }
static int cdrom_sysctl_info(ctl_table *ctl, int write, struct file * filp, static int cdrom_sysctl_info(ctl_table *ctl, int write,
void __user *buffer, size_t *lenp, loff_t *ppos) void __user *buffer, size_t *lenp, loff_t *ppos)
{ {
int pos; int pos;
@@ -3489,7 +3489,7 @@ static int cdrom_sysctl_info(ctl_table *ctl, int write, struct file * filp,
goto done; goto done;
doit: doit:
mutex_unlock(&cdrom_mutex); mutex_unlock(&cdrom_mutex);
return proc_dostring(ctl, write, filp, buffer, lenp, ppos); return proc_dostring(ctl, write, buffer, lenp, ppos);
done: done:
printk(KERN_INFO "cdrom: info buffer too small\n"); printk(KERN_INFO "cdrom: info buffer too small\n");
goto doit; goto doit;
@@ -3525,12 +3525,12 @@ static void cdrom_update_settings(void)
mutex_unlock(&cdrom_mutex); mutex_unlock(&cdrom_mutex);
} }
static int cdrom_sysctl_handler(ctl_table *ctl, int write, struct file * filp, static int cdrom_sysctl_handler(ctl_table *ctl, int write,
void __user *buffer, size_t *lenp, loff_t *ppos) void __user *buffer, size_t *lenp, loff_t *ppos)
{ {
int ret; int ret;
ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos); ret = proc_dointvec(ctl, write, buffer, lenp, ppos);
if (write) { if (write) {
drivers/char/random.c
+2 -2
View File
@@ -1231,7 +1231,7 @@ static char sysctl_bootid[16];
* as an ASCII string in the standard UUID format. If accesses via the * as an ASCII string in the standard UUID format. If accesses via the
* sysctl system call, it is returned as 16 bytes of binary data. * sysctl system call, it is returned as 16 bytes of binary data.
*/ */
static int proc_do_uuid(ctl_table *table, int write, struct file *filp, static int proc_do_uuid(ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos) void __user *buffer, size_t *lenp, loff_t *ppos)
{ {
ctl_table fake_table; ctl_table fake_table;
@@ -1254,7 +1254,7 @@ static int proc_do_uuid(ctl_table *table, int write, struct file *filp,
fake_table.data = buf; fake_table.data = buf;
fake_table.maxlen = sizeof(buf); fake_table.maxlen = sizeof(buf);
return proc_dostring(&fake_table, write, filp, buffer, lenp, ppos); return proc_dostring(&fake_table, write, buffer, lenp, ppos);
} }
static int uuid_strategy(ctl_table *table, static int uuid_strategy(ctl_table *table,
drivers/net/wireless/arlan-proc.c
+14 -14
View File
@@ -402,7 +402,7 @@ static int arlan_setup_card_by_book(struct net_device *dev)
static char arlan_drive_info[ARLAN_STR_SIZE] = "A655\n\0"; static char arlan_drive_info[ARLAN_STR_SIZE] = "A655\n\0";
static int arlan_sysctl_info(ctl_table * ctl, int write, struct file *filp, static int arlan_sysctl_info(ctl_table * ctl, int write,
void __user *buffer, size_t * lenp, loff_t *ppos) void __user *buffer, size_t * lenp, loff_t *ppos)
{ {
int i; int i;
@@ -629,7 +629,7 @@ final:
*lenp = pos; *lenp = pos;
if (!write) if (!write)
retv = proc_dostring(ctl, write, filp, buffer, lenp, ppos); retv = proc_dostring(ctl, write, buffer, lenp, ppos);
else else
{ {
*lenp = 0; *lenp = 0;
@@ -639,7 +639,7 @@ final:
} }
static int arlan_sysctl_info161719(ctl_table * ctl, int write, struct file *filp, static int arlan_sysctl_info161719(ctl_table * ctl, int write,
void __user *buffer, size_t * lenp, loff_t *ppos) void __user *buffer, size_t * lenp, loff_t *ppos)
{ {
int i; int i;
@@ -669,11 +669,11 @@ static int arlan_sysctl_info161719(ctl_table * ctl, int write, struct file *filp
final: final:
*lenp = pos; *lenp = pos;
retv = proc_dostring(ctl, write, filp, buffer, lenp, ppos); retv = proc_dostring(ctl, write, buffer, lenp, ppos);
return retv; return retv;
} }
static int arlan_sysctl_infotxRing(ctl_table * ctl, int write, struct file *filp, static int arlan_sysctl_infotxRing(ctl_table * ctl, int write,
void __user *buffer, size_t * lenp, loff_t *ppos) void __user *buffer, size_t * lenp, loff_t *ppos)
{ {
int i; int i;
@@ -698,11 +698,11 @@ static int arlan_sysctl_infotxRing(ctl_table * ctl, int write, struct file *filp
SARLBNpln(u_char, txBuffer, 0x800); SARLBNpln(u_char, txBuffer, 0x800);
final: final:
*lenp = pos; *lenp = pos;
retv = proc_dostring(ctl, write, filp, buffer, lenp, ppos); retv = proc_dostring(ctl, write, buffer, lenp, ppos);
return retv; return retv;
} }
static int arlan_sysctl_inforxRing(ctl_table * ctl, int write, struct file *filp, static int arlan_sysctl_inforxRing(ctl_table * ctl, int write,
void __user *buffer, size_t * lenp, loff_t *ppos) void __user *buffer, size_t * lenp, loff_t *ppos)
{ {
int i; int i;
@@ -726,11 +726,11 @@ static int arlan_sysctl_inforxRing(ctl_table * ctl, int write, struct file *filp
SARLBNpln(u_char, rxBuffer, 0x800); SARLBNpln(u_char, rxBuffer, 0x800);
final: final:
*lenp = pos; *lenp = pos;
retv = proc_dostring(ctl, write, filp, buffer, lenp, ppos); retv = proc_dostring(ctl, write, buffer, lenp, ppos);
return retv; return retv;
} }
static int arlan_sysctl_info18(ctl_table * ctl, int write, struct file *filp, static int arlan_sysctl_info18(ctl_table * ctl, int write,
void __user *buffer, size_t * lenp, loff_t *ppos) void __user *buffer, size_t * lenp, loff_t *ppos)
{ {
int i; int i;
@@ -756,7 +756,7 @@ static int arlan_sysctl_info18(ctl_table * ctl, int write, struct file *filp,
final: final:
*lenp = pos; *lenp = pos;
retv = proc_dostring(ctl, write, filp, buffer, lenp, ppos); retv = proc_dostring(ctl, write, buffer, lenp, ppos);
return retv; return retv;
} }
@@ -766,7 +766,7 @@ final:
static char conf_reset_result[200]; static char conf_reset_result[200];
static int arlan_configure(ctl_table * ctl, int write, struct file *filp, static int arlan_configure(ctl_table * ctl, int write,
void __user *buffer, size_t * lenp, loff_t *ppos) void __user *buffer, size_t * lenp, loff_t *ppos)
{ {
int pos = 0; int pos = 0;
@@ -788,10 +788,10 @@ static int arlan_configure(ctl_table * ctl, int write, struct file *filp,
return -1; return -1;
*lenp = pos; *lenp = pos;
return proc_dostring(ctl, write, filp, buffer, lenp, ppos); return proc_dostring(ctl, write, buffer, lenp, ppos);
} }
static int arlan_sysctl_reset(ctl_table * ctl, int write, struct file *filp, static int arlan_sysctl_reset(ctl_table * ctl, int write,
void __user *buffer, size_t * lenp, loff_t *ppos) void __user *buffer, size_t * lenp, loff_t *ppos)
{ {
int pos = 0; int pos = 0;
@@ -811,7 +811,7 @@ static int arlan_sysctl_reset(ctl_table * ctl, int write, struct file *filp,
} else } else
return -1; return -1;
*lenp = pos + 3; *lenp = pos + 3;
return proc_dostring(ctl, write, filp, buffer, lenp, ppos); return proc_dostring(ctl, write, buffer, lenp, ppos);
} }
drivers/parport/procfs.c
+6 -6
View File
@@ -31,7 +31,7 @@
#define PARPORT_MIN_SPINTIME_VALUE 1 #define PARPORT_MIN_SPINTIME_VALUE 1
#define PARPORT_MAX_SPINTIME_VALUE 1000 #define PARPORT_MAX_SPINTIME_VALUE 1000
static int do_active_device(ctl_table *table, int write, struct file *filp, static int do_active_device(ctl_table *table, int write,
void __user *result, size_t *lenp, loff_t *ppos) void __user *result, size_t *lenp, loff_t *ppos)
{ {
struct parport *port = (struct parport *)table->extra1; struct parport *port = (struct parport *)table->extra1;
@@ -68,7 +68,7 @@ static int do_active_device(ctl_table *table, int write, struct file *filp,
} }
#ifdef CONFIG_PARPORT_1284 #ifdef CONFIG_PARPORT_1284
static int do_autoprobe(ctl_table *table, int write, struct file *filp, static int do_autoprobe(ctl_table *table, int write,
void __user *result, size_t *lenp, loff_t *ppos) void __user *result, size_t *lenp, loff_t *ppos)
{ {
struct parport_device_info *info = table->extra2; struct parport_device_info *info = table->extra2;
@@ -111,7 +111,7 @@ static int do_autoprobe(ctl_table *table, int write, struct file *filp,
#endif /* IEEE1284.3 support. */ #endif /* IEEE1284.3 support. */
static int do_hardware_base_addr (ctl_table *table, int write, static int do_hardware_base_addr (ctl_table *table, int write,
struct file *filp, void __user *result, void __user *result,
size_t *lenp, loff_t *ppos) size_t *lenp, loff_t *ppos)
{ {
struct parport *port = (struct parport *)table->extra1; struct parport *port = (struct parport *)table->extra1;
@@ -139,7 +139,7 @@ static int do_hardware_base_addr (ctl_table *table, int write,
} }
static int do_hardware_irq (ctl_table *table, int write, static int do_hardware_irq (ctl_table *table, int write,
struct file *filp, void __user *result, void __user *result,
size_t *lenp, loff_t *ppos) size_t *lenp, loff_t *ppos)
{ {
struct parport *port = (struct parport *)table->extra1; struct parport *port = (struct parport *)table->extra1;
@@ -167,7 +167,7 @@ static int do_hardware_irq (ctl_table *table, int write,
} }
static int do_hardware_dma (ctl_table *table, int write, static int do_hardware_dma (ctl_table *table, int write,
struct file *filp, void __user *result, void __user *result,
size_t *lenp, loff_t *ppos) size_t *lenp, loff_t *ppos)
{ {
struct parport *port = (struct parport *)table->extra1; struct parport *port = (struct parport *)table->extra1;
@@ -195,7 +195,7 @@ static int do_hardware_dma (ctl_table *table, int write,
} }
static int do_hardware_modes (ctl_table *table, int write, static int do_hardware_modes (ctl_table *table, int write,
struct file *filp, void __user *result, void __user *result,
size_t *lenp, loff_t *ppos) size_t *lenp, loff_t *ppos)
{ {
struct parport *port = (struct parport *)table->extra1; struct parport *port = (struct parport *)table->extra1;
fs/coda/coda_int.h
+1
View File
@@ -2,6 +2,7 @@
#define _CODA_INT_ #define _CODA_INT_
struct dentry; struct dentry;
struct file;
extern struct file_system_type coda_fs_type; extern struct file_system_type coda_fs_type;
extern unsigned long coda_timeout; extern unsigned long coda_timeout;
fs/drop_caches.c
+2 -2
View File
@@ -63,9 +63,9 @@ static void drop_slab(void)
} }
int drop_caches_sysctl_handler(ctl_table *table, int write, 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 (write) {
if (sysctl_drop_caches & 1) if (sysctl_drop_caches & 1)
drop_pagecache(); drop_pagecache();
fs/file_table.c
+3 -3
View File
@@ -74,14 +74,14 @@ EXPORT_SYMBOL_GPL(get_max_files);
* Handle nr_files sysctl * Handle nr_files sysctl
*/ */
#if defined(CONFIG_SYSCTL) && defined(CONFIG_PROC_FS) #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) void __user *buffer, size_t *lenp, loff_t *ppos)
{ {
files_stat.nr_files = get_nr_files(); 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 #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) void __user *buffer, size_t *lenp, loff_t *ppos)
{ {
return -ENOSYS; return -ENOSYS;
fs/proc/proc_sysctl.c
+1 -1
View File
@@ -153,7 +153,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
/* careful: calling conventions are nasty here */ /* careful: calling conventions are nasty here */
res = count; res = count;
error = table->proc_handler(table, write, filp, buf, &res, ppos); error = table->proc_handler(table, write, buf, &res, ppos);
if (!error) if (!error)
error = res; error = res;
out: out:
fs/xfs/linux-2.6/xfs_sysctl.c
+1 -2
View File
@@ -26,7 +26,6 @@ STATIC int
xfs_stats_clear_proc_handler( xfs_stats_clear_proc_handler(
ctl_table *ctl, ctl_table *ctl,
int write, int write,
struct file *filp,
void __user *buffer, void __user *buffer,
size_t *lenp, size_t *lenp,
loff_t *ppos) loff_t *ppos)
@@ -34,7 +33,7 @@ xfs_stats_clear_proc_handler(
int c, ret, *valp = ctl->data; int c, ret, *valp = ctl->data;
__uint32_t vn_active; __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) { if (!ret && write && *valp) {
printk("XFS Clearing xfsstats\n"); printk("XFS Clearing xfsstats\n");
include/linux/fs.h
+1 -1
View File
@@ -2467,7 +2467,7 @@ ssize_t simple_attr_write(struct file *file, const char __user *buf,
size_t len, loff_t *ppos); size_t len, loff_t *ppos);
struct ctl_table; struct ctl_table;
int proc_nr_files(struct ctl_table *table, int write, struct file *filp, int proc_nr_files(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos); void __user *buffer, size_t *lenp, loff_t *ppos);
int __init get_filesystem_list(char *buf); int __init get_filesystem_list(char *buf);
include/linux/ftrace.h
+2 -2
View File
@@ -19,7 +19,7 @@
extern int ftrace_enabled; extern int ftrace_enabled;
extern int extern int
ftrace_enable_sysctl(struct ctl_table *table, int write, ftrace_enable_sysctl(struct ctl_table *table, int write,
struct file *filp, void __user *buffer, size_t *lenp, void __user *buffer, size_t *lenp,
loff_t *ppos); loff_t *ppos);
typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip); typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip);
@@ -94,7 +94,7 @@ static inline void ftrace_start(void) { }
extern int stack_tracer_enabled; extern int stack_tracer_enabled;
int int
stack_trace_sysctl(struct ctl_table *table, int write, stack_trace_sysctl(struct ctl_table *table, int write,
struct file *file, void __user *buffer, size_t *lenp, void __user *buffer, size_t *lenp,
loff_t *ppos); loff_t *ppos);
#endif #endif
include/linux/hugetlb.h
+3 -3
View File
@@ -20,9 +20,9 @@ static inline int is_vm_hugetlb_page(struct vm_area_struct *vma)
} }
void reset_vma_resv_huge_pages(struct vm_area_struct *vma); void reset_vma_resv_huge_pages(struct vm_area_struct *vma);
int hugetlb_sysctl_handler(struct ctl_table *, int, struct file *, void __user *, size_t *, loff_t *); int hugetlb_sysctl_handler(struct ctl_table *, int, void __user *, size_t *, loff_t *);
int hugetlb_overcommit_handler(struct ctl_table *, int, struct file *, void __user *, size_t *, loff_t *); int hugetlb_overcommit_handler(struct ctl_table *, int, void __user *, size_t *, loff_t *);
int hugetlb_treat_movable_handler(struct ctl_table *, int, struct file *, void __user *, size_t *, loff_t *); int hugetlb_treat_movable_handler(struct ctl_table *, int, void __user *, size_t *, loff_t *);
int copy_hugetlb_page_range(struct mm_struct *, struct mm_struct *, struct vm_area_struct *); int copy_hugetlb_page_range(struct mm_struct *, struct mm_struct *, struct vm_area_struct *);
int follow_hugetlb_page(struct mm_struct *, struct vm_area_struct *, int follow_hugetlb_page(struct mm_struct *, struct vm_area_struct *,
struct page **, struct vm_area_struct **, struct page **, struct vm_area_struct **,

Some files were not shown because too many files have changed in this diff Show More