adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

sysctl: Drop & in front of every proc_handler.

Browse source 
For consistency drop & in front of every proc_handler.  Explicity
taking the address is unnecessary and it prevents optimizations
like stubbing the proc_handlers to NULL.

Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2009-11-16 03:11:48 -08:00
parent 86926d0096
commit 6d4561110a
45 changed files with 339 additions and 339 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/kernel/isa.c
View file

@ -26,19 +26,19 @@ static ctl_table ctl_isa_vars[4] = {
.data = &isa_membase, .data = &isa_membase,
.maxlen = sizeof(isa_membase), .maxlen = sizeof(isa_membase),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, { }, {
.procname = "portbase", .procname = "portbase",
.data = &isa_portbase, .data = &isa_portbase,
.maxlen = sizeof(isa_portbase), .maxlen = sizeof(isa_portbase),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, { }, {
.procname = "portshift", .procname = "portshift",
.data = &isa_portshift, .data = &isa_portshift,
.maxlen = sizeof(isa_portshift), .maxlen = sizeof(isa_portshift),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, {} }, {}
}; };

2
arch/arm/mach-bcmring/arch.c
View file

@ -58,7 +58,7 @@ static struct ctl_table bcmring_sysctl_warm_reboot[] = {
.data = &bcmring_arch_warm_reboot, .data = &bcmring_arch_warm_reboot,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec}, .proc_handler = proc_dointvec},
{} {}
}; };

8
arch/frv/kernel/pm.c
View file

@ -303,28 +303,28 @@ static struct ctl_table pm_table[] =
.data = NULL, .data = NULL,
.maxlen = 0, .maxlen = 0,
.mode = 0200, .mode = 0200,
.proc_handler = &sysctl_pm_do_suspend, .proc_handler = sysctl_pm_do_suspend,
}, },
{ {
.procname = "cmode", .procname = "cmode",
.data = &clock_cmode_current, .data = &clock_cmode_current,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &cmode_procctl, .proc_handler = cmode_procctl,
}, },
{ {
.procname = "p0", .procname = "p0",
.data = &clock_p0_current, .data = &clock_p0_current,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &p0_procctl, .proc_handler = p0_procctl,
}, },
{ {
.procname = "cm", .procname = "cm",
.data = &clock_cm_current, .data = &clock_cm_current,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &cm_procctl, .proc_handler = cm_procctl,
}, },
{ } { }
}; };

4
arch/frv/kernel/sysctl.c
View file

@ -180,7 +180,7 @@ static struct ctl_table frv_table[] =
.data = NULL, .data = NULL,
.maxlen = 0, .maxlen = 0,
.mode = 0644, .mode = 0644,
.proc_handler = &procctl_frv_cachemode, .proc_handler = procctl_frv_cachemode,
}, },
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
{ {
@ -188,7 +188,7 @@ static struct ctl_table frv_table[] =
.data = NULL, .data = NULL,
.maxlen = 0, .maxlen = 0,
.mode = 0644, .mode = 0644,
.proc_handler = &procctl_frv_pin_cxnr .proc_handler = procctl_frv_pin_cxnr
}, },
#endif #endif
{} {}

4
arch/ia64/kernel/crash.c
View file

@ -243,14 +243,14 @@ static ctl_table kdump_ctl_table[] = {
.data = &kdump_on_init, .data = &kdump_on_init,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "kdump_on_fatal_mca", .procname = "kdump_on_fatal_mca",
.data = &kdump_on_fatal_mca, .data = &kdump_on_fatal_mca,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ } { }
}; };

8
arch/ia64/kernel/perfmon.c
View file

@ -526,28 +526,28 @@ static ctl_table pfm_ctl_table[]={
.data = &pfm_sysctl.debug, .data = &pfm_sysctl.debug,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0666, .mode = 0666,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "debug_ovfl", .procname = "debug_ovfl",
.data = &pfm_sysctl.debug_ovfl, .data = &pfm_sysctl.debug_ovfl,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0666, .mode = 0666,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "fastctxsw", .procname = "fastctxsw",
.data = &pfm_sysctl.fastctxsw, .data = &pfm_sysctl.fastctxsw,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0600, .mode = 0600,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "expert_mode", .procname = "expert_mode",
.data = &pfm_sysctl.expert_mode, .data = &pfm_sysctl.expert_mode,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0600, .mode = 0600,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{} {}
}; };

22
arch/mips/lasat/sysctl.c
View file

@ -182,28 +182,28 @@ static ctl_table lasat_table[] = {
.data = &lasat_board_info.li_cpu_hz, .data = &lasat_board_info.li_cpu_hz,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "bus-hz", .procname = "bus-hz",
.data = &lasat_board_info.li_bus_hz, .data = &lasat_board_info.li_bus_hz,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "bmid", .procname = "bmid",
.data = &lasat_board_info.li_bmid, .data = &lasat_board_info.li_bmid,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "prid", .procname = "prid",
.data = &lasat_board_info.li_prid, .data = &lasat_board_info.li_prid,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_lasat_prid, .proc_handler = proc_lasat_prid,
. }, . },
#ifdef CONFIG_INET #ifdef CONFIG_INET
{ {
@ -211,14 +211,14 @@ static ctl_table lasat_table[] = {
.data = &lasat_board_info.li_eeprom_info.ipaddr, .data = &lasat_board_info.li_eeprom_info.ipaddr,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_lasat_ip, .proc_handler = proc_lasat_ip,
}, },
{ {
.procname = "netmask", .procname = "netmask",
.data = &lasat_board_info.li_eeprom_info.netmask, .data = &lasat_board_info.li_eeprom_info.netmask,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_lasat_ip, .proc_handler = proc_lasat_ip,
}, },
#endif #endif
{ {
@ -227,14 +227,14 @@ static ctl_table lasat_table[] = {
.maxlen = .maxlen =
sizeof(lasat_board_info.li_eeprom_info.passwd_hash), sizeof(lasat_board_info.li_eeprom_info.passwd_hash),
.mode = 0600, .mode = 0600,
.proc_handler = &proc_dolasatstring, .proc_handler = proc_dolasatstring,
}, },
{ {
.procname = "boot-service", .procname = "boot-service",
.data = &lasat_boot_to_service, .data = &lasat_boot_to_service,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
#ifdef CONFIG_DS1603 #ifdef CONFIG_DS1603
{ {
@ -242,7 +242,7 @@ static ctl_table lasat_table[] = {
.data = &rtctmp, .data = &rtctmp,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dolasatrtc, .proc_handler = proc_dolasatrtc,
}, },
#endif #endif
{ {
@ -250,14 +250,14 @@ static ctl_table lasat_table[] = {
.data = &lasat_board_info.li_namestr, .data = &lasat_board_info.li_namestr,
.maxlen = sizeof(lasat_board_info.li_namestr), .maxlen = sizeof(lasat_board_info.li_namestr),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dostring, .proc_handler = proc_dostring,
}, },
{ {
.procname = "typestr", .procname = "typestr",
.data = &lasat_board_info.li_typestr, .data = &lasat_board_info.li_typestr,
.maxlen = sizeof(lasat_board_info.li_typestr), .maxlen = sizeof(lasat_board_info.li_typestr),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dostring, .proc_handler = proc_dostring,
}, },
{} {}
}; };

2
arch/powerpc/kernel/idle.c
View file

@ -114,7 +114,7 @@ static ctl_table powersave_nap_ctl_table[]={
.data = &powersave_nap, .data = &powersave_nap,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{} {}
}; };

4
arch/s390/appldata/appldata_base.c
View file

@ -61,12 +61,12 @@ static struct ctl_table appldata_table[] = {
{ {
.procname = "timer", .procname = "timer",
.mode = S_IRUGO | S_IWUSR, .mode = S_IRUGO | S_IWUSR,
.proc_handler = &appldata_timer_handler, .proc_handler = appldata_timer_handler,
}, },
{ {
.procname = "interval", .procname = "interval",
.mode = S_IRUGO | S_IWUSR, .mode = S_IRUGO | S_IWUSR,
.proc_handler = &appldata_interval_handler, .proc_handler = appldata_interval_handler,
}, },
{ }, { },
}; };

4
arch/s390/kernel/debug.c
View file

@ -897,14 +897,14 @@ static struct ctl_table s390dbf_table[] = {
.data = &debug_stoppable, .data = &debug_stoppable,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = S_IRUGO | S_IWUSR, .mode = S_IRUGO | S_IWUSR,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "debug_active", .procname = "debug_active",
.data = &debug_active, .data = &debug_active,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = S_IRUGO | S_IWUSR, .mode = S_IRUGO | S_IWUSR,
.proc_handler = &s390dbf_procactive, .proc_handler = s390dbf_procactive,
}, },
{ } { }
}; };

6
arch/s390/mm/cmm.c
View file

@ -343,17 +343,17 @@ static struct ctl_table cmm_table[] = {
{ {
.procname = "cmm_pages", .procname = "cmm_pages",
.mode = 0644, .mode = 0644,
.proc_handler = &cmm_pages_handler, .proc_handler = cmm_pages_handler,
}, },
{ {
.procname = "cmm_timed_pages", .procname = "cmm_timed_pages",
.mode = 0644, .mode = 0644,
.proc_handler = &cmm_pages_handler, .proc_handler = cmm_pages_handler,
}, },
{ {
.procname = "cmm_timeout", .procname = "cmm_timeout",
.mode = 0644, .mode = 0644,
.proc_handler = &cmm_timeout_handler, .proc_handler = cmm_timeout_handler,
}, },
{ } { }
}; };

6
arch/sh/kernel/traps_64.c
View file

@ -881,21 +881,21 @@ static ctl_table unaligned_table[] = {
.data = &kernel_mode_unaligned_fixup_count, .data = &kernel_mode_unaligned_fixup_count,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec .proc_handler = proc_dointvec
}, },
{ {
.procname = "user_reports", .procname = "user_reports",
.data = &user_mode_unaligned_fixup_count, .data = &user_mode_unaligned_fixup_count,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec .proc_handler = proc_dointvec
}, },
{ {
.procname = "user_enable", .procname = "user_enable",
.data = &user_mode_unaligned_fixup_enable, .data = &user_mode_unaligned_fixup_enable,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec}, .proc_handler = proc_dointvec},
{} {}
}; };

2
crypto/proc.c
View file

@ -29,7 +29,7 @@ static struct ctl_table crypto_sysctl_table[] = {
.data = &fips_enabled, .data = &fips_enabled,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec .proc_handler = proc_dointvec
}, },
{} {}
}; };

12
drivers/cdrom/cdrom.c
View file

@ -3557,42 +3557,42 @@ static ctl_table cdrom_table[] = {
.data = &cdrom_sysctl_settings.info, .data = &cdrom_sysctl_settings.info,
.maxlen = CDROM_STR_SIZE, .maxlen = CDROM_STR_SIZE,
.mode = 0444, .mode = 0444,
.proc_handler = &cdrom_sysctl_info, .proc_handler = cdrom_sysctl_info,
}, },
{ {
.procname = "autoclose", .procname = "autoclose",
.data = &cdrom_sysctl_settings.autoclose, .data = &cdrom_sysctl_settings.autoclose,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &cdrom_sysctl_handler, .proc_handler = cdrom_sysctl_handler,
}, },
{ {
.procname = "autoeject", .procname = "autoeject",
.data = &cdrom_sysctl_settings.autoeject, .data = &cdrom_sysctl_settings.autoeject,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &cdrom_sysctl_handler, .proc_handler = cdrom_sysctl_handler,
}, },
{ {
.procname = "debug", .procname = "debug",
.data = &cdrom_sysctl_settings.debug, .data = &cdrom_sysctl_settings.debug,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &cdrom_sysctl_handler, .proc_handler = cdrom_sysctl_handler,
}, },
{ {
.procname = "lock", .procname = "lock",
.data = &cdrom_sysctl_settings.lock, .data = &cdrom_sysctl_settings.lock,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &cdrom_sysctl_handler, .proc_handler = cdrom_sysctl_handler,
}, },
{ {
.procname = "check_media", .procname = "check_media",
.data = &cdrom_sysctl_settings.check, .data = &cdrom_sysctl_settings.check,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &cdrom_sysctl_handler .proc_handler = cdrom_sysctl_handler
}, },
{ } { }
}; };

2
drivers/char/hpet.c
View file

@ -679,7 +679,7 @@ static ctl_table hpet_table[] = {
.data = &hpet_max_freq, .data = &hpet_max_freq,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{} {}
}; };

2
drivers/char/ipmi/ipmi_poweroff.c
View file

@ -664,7 +664,7 @@ static ctl_table ipmi_table[] = {
.data = &poweroff_powercycle, .data = &poweroff_powercycle,
.maxlen = sizeof(poweroff_powercycle), .maxlen = sizeof(poweroff_powercycle),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec }, .proc_handler = proc_dointvec },
{ } { }
}; };

4
drivers/char/pty.c
View file

@ -435,7 +435,7 @@ static struct ctl_table pty_table[] = {
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.data = &pty_limit, .data = &pty_limit,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &pty_limit_min, .extra1 = &pty_limit_min,
.extra2 = &pty_limit_max, .extra2 = &pty_limit_max,
}, { }, {
@ -443,7 +443,7 @@ static struct ctl_table pty_table[] = {
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.data = &pty_count, .data = &pty_count,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{} {}
}; };

12
drivers/char/random.c
View file

@ -1264,13 +1264,13 @@ ctl_table random_table[] = {
.data = &sysctl_poolsize, .data = &sysctl_poolsize,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "entropy_avail", .procname = "entropy_avail",
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
.data = &input_pool.entropy_count, .data = &input_pool.entropy_count,
}, },
{ {
@ -1278,7 +1278,7 @@ ctl_table random_table[] = {
.data = &random_read_wakeup_thresh, .data = &random_read_wakeup_thresh,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &min_read_thresh, .extra1 = &min_read_thresh,
.extra2 = &max_read_thresh, .extra2 = &max_read_thresh,
}, },
@ -1287,7 +1287,7 @@ ctl_table random_table[] = {
.data = &random_write_wakeup_thresh, .data = &random_write_wakeup_thresh,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &min_write_thresh, .extra1 = &min_write_thresh,
.extra2 = &max_write_thresh, .extra2 = &max_write_thresh,
}, },
@ -1296,13 +1296,13 @@ ctl_table random_table[] = {
.data = &sysctl_bootid, .data = &sysctl_bootid,
.maxlen = 16, .maxlen = 16,
.mode = 0444, .mode = 0444,
.proc_handler = &proc_do_uuid, .proc_handler = proc_do_uuid,
}, },
{ {
.procname = "uuid", .procname = "uuid",
.maxlen = 16, .maxlen = 16,
.mode = 0444, .mode = 0444,
.proc_handler = &proc_do_uuid, .proc_handler = proc_do_uuid,
}, },
{ } { }
}; };

2
drivers/char/rtc.c
View file

@ -286,7 +286,7 @@ static ctl_table rtc_table[] = {
.data = &rtc_max_user_freq, .data = &rtc_max_user_freq,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ } { }
}; };

6
drivers/macintosh/mac_hid.c
View file

@ -31,21 +31,21 @@ static ctl_table mac_hid_files[] = {
.data = &mouse_emulate_buttons, .data = &mouse_emulate_buttons,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "mouse_button2_keycode", .procname = "mouse_button2_keycode",
.data = &mouse_button2_keycode, .data = &mouse_button2_keycode,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "mouse_button3_keycode", .procname = "mouse_button3_keycode",
.data = &mouse_button3_keycode, .data = &mouse_button3_keycode,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ } { }
}; };

4
drivers/md/md.c
View file

@ -102,14 +102,14 @@ static ctl_table raid_table[] = {
.data = &sysctl_speed_limit_min, .data = &sysctl_speed_limit_min,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = S_IRUGO|S_IWUSR, .mode = S_IRUGO|S_IWUSR,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "speed_limit_max", .procname = "speed_limit_max",
.data = &sysctl_speed_limit_max, .data = &sysctl_speed_limit_max,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = S_IRUGO|S_IWUSR, .mode = S_IRUGO|S_IWUSR,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ } { }
}; };

6
drivers/misc/sgi-xp/xpc_main.c
View file

@ -93,7 +93,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = {
.data = &xpc_hb_interval, .data = &xpc_hb_interval,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xpc_hb_min_interval, .extra1 = &xpc_hb_min_interval,
.extra2 = &xpc_hb_max_interval}, .extra2 = &xpc_hb_max_interval},
{ {
@ -101,7 +101,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = {
.data = &xpc_hb_check_interval, .data = &xpc_hb_check_interval,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xpc_hb_check_min_interval, .extra1 = &xpc_hb_check_min_interval,
.extra2 = &xpc_hb_check_max_interval}, .extra2 = &xpc_hb_check_max_interval},
{} {}
@ -116,7 +116,7 @@ static ctl_table xpc_sys_xpc_dir[] = {
.data = &xpc_disengage_timelimit, .data = &xpc_disengage_timelimit,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xpc_disengage_min_timelimit, .extra1 = &xpc_disengage_min_timelimit,
.extra2 = &xpc_disengage_max_timelimit}, .extra2 = &xpc_disengage_max_timelimit},
{} {}

64
drivers/net/wireless/arlan-proc.c
View file

@ -819,15 +819,15 @@ static int arlan_sysctl_reset(ctl_table * ctl, int write,
#define CTBLN(card,nam) \ #define CTBLN(card,nam) \
{ .procname = #nam,\ { .procname = #nam,\
.data = &(arlan_conf[card].nam),\ .data = &(arlan_conf[card].nam),\
.maxlen = sizeof(int), .mode = 0600, .proc_handler = &proc_dointvec} .maxlen = sizeof(int), .mode = 0600, .proc_handler = proc_dointvec}
#ifdef ARLAN_DEBUGGING #ifdef ARLAN_DEBUGGING
#define ARLAN_PROC_DEBUG_ENTRIES \ #define ARLAN_PROC_DEBUG_ENTRIES \
{ .procname = "entry_exit_debug",\ { .procname = "entry_exit_debug",\
.data = &arlan_entry_and_exit_debug,\ .data = &arlan_entry_and_exit_debug,\
.maxlen = sizeof(int), .mode = 0600, .proc_handler = &proc_dointvec},\ .maxlen = sizeof(int), .mode = 0600, .proc_handler = proc_dointvec},\
{ .procname = "debug", .data = &arlan_debug,\ { .procname = "debug", .data = &arlan_debug,\
.maxlen = sizeof(int), .mode = 0600, .proc_handler = &proc_dointvec}, .maxlen = sizeof(int), .mode = 0600, .proc_handler = proc_dointvec},
#else #else
#define ARLAN_PROC_DEBUG_ENTRIES #define ARLAN_PROC_DEBUG_ENTRIES
#endif #endif
@ -864,7 +864,7 @@ static int arlan_sysctl_reset(ctl_table * ctl, int write,
CTBLN(cardNo, channelSet), \ CTBLN(cardNo, channelSet), \
{ .procname = "name",\ { .procname = "name",\
.data = arlan_conf[cardNo].siteName,\ .data = arlan_conf[cardNo].siteName,\
.maxlen = 16, .mode = 0600, .proc_handler = &proc_dostring},\ .maxlen = 16, .mode = 0600, .proc_handler = proc_dostring},\
CTBLN(cardNo,waitTime),\ CTBLN(cardNo,waitTime),\
CTBLN(cardNo,lParameter),\ CTBLN(cardNo,lParameter),\
CTBLN(cardNo,_15),\ CTBLN(cardNo,_15),\
@ -906,35 +906,35 @@ static ctl_table arlan_conf_table0[] =
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_infotxRing, .proc_handler = arlan_sysctl_infotxRing,
}, },
{ {
.procname = "arlan0-rxRing", .procname = "arlan0-rxRing",
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_inforxRing, .proc_handler = arlan_sysctl_inforxRing,
}, },
{ {
.procname = "arlan0-18", .procname = "arlan0-18",
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_info18, .proc_handler = arlan_sysctl_info18,
}, },
{ {
.procname = "arlan0-ring", .procname = "arlan0-ring",
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_info161719, .proc_handler = arlan_sysctl_info161719,
}, },
{ {
.procname = "arlan0-shm-cpy", .procname = "arlan0-shm-cpy",
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_info, .proc_handler = arlan_sysctl_info,
}, },
#endif #endif
{ {
@ -942,14 +942,14 @@ static ctl_table arlan_conf_table0[] =
.data = &conf_reset_result, .data = &conf_reset_result,
.maxlen = 100, .maxlen = 100,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_configure .proc_handler = arlan_configure
}, },
{ {
.procname = "reset0", .procname = "reset0",
.data = &conf_reset_result, .data = &conf_reset_result,
.maxlen = 100, .maxlen = 100,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_reset, .proc_handler = arlan_sysctl_reset,
}, },
{ } { }
}; };
@ -965,35 +965,35 @@ static ctl_table arlan_conf_table1[] =
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_infotxRing, .proc_handler = arlan_sysctl_infotxRing,
}, },
{ {
.procname = "arlan1-rxRing", .procname = "arlan1-rxRing",
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_inforxRing, .proc_handler = arlan_sysctl_inforxRing,
}, },
{ {
.procname = "arlan1-18", .procname = "arlan1-18",
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_info18, .proc_handler = arlan_sysctl_info18,
}, },
{ {
.procname = "arlan1-ring", .procname = "arlan1-ring",
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_info161719, .proc_handler = arlan_sysctl_info161719,
}, },
{ {
.procname = "arlan1-shm-cpy", .procname = "arlan1-shm-cpy",
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_info, .proc_handler = arlan_sysctl_info,
}, },
#endif #endif
{ {
@ -1001,14 +1001,14 @@ static ctl_table arlan_conf_table1[] =
.data = &conf_reset_result, .data = &conf_reset_result,
.maxlen = 100, .maxlen = 100,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_configure, .proc_handler = arlan_configure,
}, },
{ {
.procname = "reset1", .procname = "reset1",
.data = &conf_reset_result, .data = &conf_reset_result,
.maxlen = 100, .maxlen = 100,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_reset, .proc_handler = arlan_sysctl_reset,
}, },
{ } { }
}; };
@ -1024,35 +1024,35 @@ static ctl_table arlan_conf_table2[] =
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_infotxRing, .proc_handler = arlan_sysctl_infotxRing,
}, },
{ {
.procname = "arlan2-rxRing", .procname = "arlan2-rxRing",
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_inforxRing, .proc_handler = arlan_sysctl_inforxRing,
}, },
{ {
.procname = "arlan2-18", .procname = "arlan2-18",
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_info18, .proc_handler = arlan_sysctl_info18,
}, },
{ {
.procname = "arlan2-ring", .procname = "arlan2-ring",
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_info161719, .proc_handler = arlan_sysctl_info161719,
}, },
{ {
.procname = "arlan2-shm-cpy", .procname = "arlan2-shm-cpy",
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_info, .proc_handler = arlan_sysctl_info,
}, },
#endif #endif
{ {
@ -1060,14 +1060,14 @@ static ctl_table arlan_conf_table2[] =
.data = &conf_reset_result, .data = &conf_reset_result,
.maxlen = 100, .maxlen = 100,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_configure, .proc_handler = arlan_configure,
}, },
{ {
.procname = "reset2", .procname = "reset2",
.data = &conf_reset_result, .data = &conf_reset_result,
.maxlen = 100, .maxlen = 100,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_reset, .proc_handler = arlan_sysctl_reset,
}, },
{ } { }
}; };
@ -1083,35 +1083,35 @@ static ctl_table arlan_conf_table3[] =
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_infotxRing, .proc_handler = arlan_sysctl_infotxRing,
}, },
{ {
.procname = "arlan3-rxRing", .procname = "arlan3-rxRing",
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_inforxRing, .proc_handler = arlan_sysctl_inforxRing,
}, },
{ {
.procname = "arlan3-18", .procname = "arlan3-18",
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_info18, .proc_handler = arlan_sysctl_info18,
}, },
{ {
.procname = "arlan3-ring", .procname = "arlan3-ring",
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_info161719, .proc_handler = arlan_sysctl_info161719,
}, },
{ {
.procname = "arlan3-shm-cpy", .procname = "arlan3-shm-cpy",
.data = &arlan_drive_info, .data = &arlan_drive_info,
.maxlen = ARLAN_STR_SIZE, .maxlen = ARLAN_STR_SIZE,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_info, .proc_handler = arlan_sysctl_info,
}, },
#endif #endif
{ {
@ -1119,14 +1119,14 @@ static ctl_table arlan_conf_table3[] =
.data = &conf_reset_result, .data = &conf_reset_result,
.maxlen = 100, .maxlen = 100,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_configure, .proc_handler = arlan_configure,
}, },
{ {
.procname = "reset3", .procname = "reset3",
.data = &conf_reset_result, .data = &conf_reset_result,
.maxlen = 100, .maxlen = 100,
.mode = 0400, .mode = 0400,
.proc_handler = &arlan_sysctl_reset, .proc_handler = arlan_sysctl_reset,
}, },
{ } { }
}; };

28
drivers/parport/procfs.c
View file

@ -270,7 +270,7 @@ static const struct parport_sysctl_table parport_sysctl_template = {
.data = NULL, .data = NULL,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = (void*) &parport_min_spintime_value, .extra1 = (void*) &parport_min_spintime_value,
.extra2 = (void*) &parport_max_spintime_value .extra2 = (void*) &parport_max_spintime_value
}, },
@ -279,28 +279,28 @@ static const struct parport_sysctl_table parport_sysctl_template = {
.data = NULL, .data = NULL,
.maxlen = 0, .maxlen = 0,
.mode = 0444, .mode = 0444,
.proc_handler = &do_hardware_base_addr .proc_handler = do_hardware_base_addr
}, },
{ {
.procname = "irq", .procname = "irq",
.data = NULL, .data = NULL,
.maxlen = 0, .maxlen = 0,
.mode = 0444, .mode = 0444,
.proc_handler = &do_hardware_irq .proc_handler = do_hardware_irq
}, },
{ {
.procname = "dma", .procname = "dma",
.data = NULL, .data = NULL,
.maxlen = 0, .maxlen = 0,
.mode = 0444, .mode = 0444,
.proc_handler = &do_hardware_dma .proc_handler = do_hardware_dma
}, },
{ {
.procname = "modes", .procname = "modes",
.data = NULL, .data = NULL,
.maxlen = 0, .maxlen = 0,
.mode = 0444, .mode = 0444,
.proc_handler = &do_hardware_modes .proc_handler = do_hardware_modes
}, },
PARPORT_DEVICES_ROOT_DIR, PARPORT_DEVICES_ROOT_DIR,
#ifdef CONFIG_PARPORT_1284 #ifdef CONFIG_PARPORT_1284
@ -309,35 +309,35 @@ static const struct parport_sysctl_table parport_sysctl_template = {
.data = NULL, .data = NULL,
.maxlen = 0, .maxlen = 0,
.mode = 0444, .mode = 0444,
.proc_handler = &do_autoprobe .proc_handler = do_autoprobe
}, },
{ {
.procname = "autoprobe0", .procname = "autoprobe0",
.data = NULL, .data = NULL,
.maxlen = 0, .maxlen = 0,
.mode = 0444, .mode = 0444,
.proc_handler = &do_autoprobe .proc_handler = do_autoprobe
}, },
{ {
.procname = "autoprobe1", .procname = "autoprobe1",
.data = NULL, .data = NULL,
.maxlen = 0, .maxlen = 0,
.mode = 0444, .mode = 0444,
.proc_handler = &do_autoprobe .proc_handler = do_autoprobe
}, },
{ {
.procname = "autoprobe2", .procname = "autoprobe2",
.data = NULL, .data = NULL,
.maxlen = 0, .maxlen = 0,
.mode = 0444, .mode = 0444,
.proc_handler = &do_autoprobe .proc_handler = do_autoprobe
}, },
{ {
.procname = "autoprobe3", .procname = "autoprobe3",
.data = NULL, .data = NULL,
.maxlen = 0, .maxlen = 0,
.mode = 0444, .mode = 0444,
.proc_handler = &do_autoprobe .proc_handler = do_autoprobe
}, },
#endif /* IEEE 1284 support */ #endif /* IEEE 1284 support */
{} {}
@ -348,7 +348,7 @@ static const struct parport_sysctl_table parport_sysctl_template = {
.data = NULL, .data = NULL,
.maxlen = 0, .maxlen = 0,
.mode = 0444, .mode = 0444,
.proc_handler = &do_active_device .proc_handler = do_active_device
}, },
{} {}
}, },
@ -386,7 +386,7 @@ parport_device_sysctl_template = {
.data = NULL, .data = NULL,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_ms_jiffies_minmax, .proc_handler = proc_doulongvec_ms_jiffies_minmax,
.extra1 = (void*) &parport_min_timeslice_value, .extra1 = (void*) &parport_min_timeslice_value,
.extra2 = (void*) &parport_max_timeslice_value .extra2 = (void*) &parport_max_timeslice_value
}, },
@ -437,7 +437,7 @@ parport_default_sysctl_table = {
.data = &parport_default_timeslice, .data = &parport_default_timeslice,
.maxlen = sizeof(parport_default_timeslice), .maxlen = sizeof(parport_default_timeslice),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_ms_jiffies_minmax, .proc_handler = proc_doulongvec_ms_jiffies_minmax,
.extra1 = (void*) &parport_min_timeslice_value, .extra1 = (void*) &parport_min_timeslice_value,
.extra2 = (void*) &parport_max_timeslice_value .extra2 = (void*) &parport_max_timeslice_value
}, },
@ -446,7 +446,7 @@ parport_default_sysctl_table = {
.data = &parport_default_spintime, .data = &parport_default_spintime,
.maxlen = sizeof(parport_default_spintime), .maxlen = sizeof(parport_default_spintime),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = (void*) &parport_min_spintime_value, .extra1 = (void*) &parport_min_spintime_value,
.extra2 = (void*) &parport_max_spintime_value .extra2 = (void*) &parport_max_spintime_value
}, },

2
drivers/scsi/scsi_sysctl.c
View file

@ -17,7 +17,7 @@ static ctl_table scsi_table[] = {
.data = &scsi_logging_level, .data = &scsi_logging_level,
.maxlen = sizeof(scsi_logging_level), .maxlen = sizeof(scsi_logging_level),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec }, .proc_handler = proc_dointvec },
{ } { }
}; };

6
fs/coda/sysctl.c
View file

@ -21,21 +21,21 @@ static ctl_table coda_table[] = {
.data = &coda_timeout, .data = &coda_timeout,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec .proc_handler = proc_dointvec
}, },
{ {
.procname = "hard", .procname = "hard",
.data = &coda_hard, .data = &coda_hard,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec .proc_handler = proc_dointvec
}, },
{ {
.procname = "fake_statfs", .procname = "fake_statfs",
.data = &coda_fake_statfs, .data = &coda_fake_statfs,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0600, .mode = 0600,
.proc_handler = &proc_dointvec .proc_handler = proc_dointvec
}, },
{} {}
}; };

2
fs/eventpoll.c
View file

@ -251,7 +251,7 @@ ctl_table epoll_table[] = {
.data = &max_user_watches, .data = &max_user_watches,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &zero, .extra1 = &zero,
}, },
{ } { }

12
fs/lockd/svc.c
View file

@ -375,7 +375,7 @@ static ctl_table nlm_sysctls[] = {
.data = &nlm_grace_period, .data = &nlm_grace_period,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_minmax, .proc_handler = proc_doulongvec_minmax,
.extra1 = (unsigned long *) &nlm_grace_period_min, .extra1 = (unsigned long *) &nlm_grace_period_min,
.extra2 = (unsigned long *) &nlm_grace_period_max, .extra2 = (unsigned long *) &nlm_grace_period_max,
}, },
@ -384,7 +384,7 @@ static ctl_table nlm_sysctls[] = {
.data = &nlm_timeout, .data = &nlm_timeout,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_minmax, .proc_handler = proc_doulongvec_minmax,
.extra1 = (unsigned long *) &nlm_timeout_min, .extra1 = (unsigned long *) &nlm_timeout_min,
.extra2 = (unsigned long *) &nlm_timeout_max, .extra2 = (unsigned long *) &nlm_timeout_max,
}, },
@ -393,7 +393,7 @@ static ctl_table nlm_sysctls[] = {
.data = &nlm_udpport, .data = &nlm_udpport,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = (int *) &nlm_port_min, .extra1 = (int *) &nlm_port_min,
.extra2 = (int *) &nlm_port_max, .extra2 = (int *) &nlm_port_max,
}, },
@ -402,7 +402,7 @@ static ctl_table nlm_sysctls[] = {
.data = &nlm_tcpport, .data = &nlm_tcpport,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = (int *) &nlm_port_min, .extra1 = (int *) &nlm_port_min,
.extra2 = (int *) &nlm_port_max, .extra2 = (int *) &nlm_port_max,
}, },
@ -411,14 +411,14 @@ static ctl_table nlm_sysctls[] = {
.data = &nsm_use_hostnames, .data = &nsm_use_hostnames,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "nsm_local_state", .procname = "nsm_local_state",
.data = &nsm_local_state, .data = &nsm_local_state,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ } { }
}; };

8
fs/nfs/sysctl.c
View file

@ -26,7 +26,7 @@ static ctl_table nfs_cb_sysctls[] = {
.data = &nfs_callback_set_tcpport, .data = &nfs_callback_set_tcpport,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = (int *)&nfs_set_port_min, .extra1 = (int *)&nfs_set_port_min,
.extra2 = (int *)&nfs_set_port_max, .extra2 = (int *)&nfs_set_port_max,
}, },
@ -35,7 +35,7 @@ static ctl_table nfs_cb_sysctls[] = {
.data = &nfs_idmap_cache_timeout, .data = &nfs_idmap_cache_timeout,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_jiffies, .proc_handler = proc_dointvec_jiffies,
}, },
#endif #endif
{ {
@ -43,14 +43,14 @@ static ctl_table nfs_cb_sysctls[] = {
.data = &nfs_mountpoint_expiry_timeout, .data = &nfs_mountpoint_expiry_timeout,
.maxlen = sizeof(nfs_mountpoint_expiry_timeout), .maxlen = sizeof(nfs_mountpoint_expiry_timeout),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_jiffies, .proc_handler = proc_dointvec_jiffies,
}, },
{ {
.procname = "nfs_congestion_kb", .procname = "nfs_congestion_kb",
.data = &nfs_congestion_kb, .data = &nfs_congestion_kb,
.maxlen = sizeof(nfs_congestion_kb), .maxlen = sizeof(nfs_congestion_kb),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ } { }
}; };

6
fs/notify/inotify/inotify_user.c
View file

@ -73,7 +73,7 @@ ctl_table inotify_table[] = {
.data = &inotify_max_user_instances, .data = &inotify_max_user_instances,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &zero, .extra1 = &zero,
}, },
{ {
@ -81,7 +81,7 @@ ctl_table inotify_table[] = {
.data = &inotify_max_user_watches, .data = &inotify_max_user_watches,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &zero, .extra1 = &zero,
}, },
{ {
@ -89,7 +89,7 @@ ctl_table inotify_table[] = {
.data = &inotify_max_queued_events, .data = &inotify_max_queued_events,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &zero .extra1 = &zero
}, },
{ } { }

2
fs/ntfs/sysctl.c
View file

@ -40,7 +40,7 @@ static ctl_table ntfs_sysctls[] = {
.data = &debug_msgs, /* Data pointer and size. */ .data = &debug_msgs, /* Data pointer and size. */
.maxlen = sizeof(debug_msgs), .maxlen = sizeof(debug_msgs),
.mode = 0644, /* Mode, proc handler. */ .mode = 0644, /* Mode, proc handler. */
.proc_handler = &proc_dointvec .proc_handler = proc_dointvec
}, },
{} {}
}; };

2
fs/ocfs2/stackglue.c
View file

@ -624,7 +624,7 @@ static ctl_table ocfs2_nm_table[] = {
.data = ocfs2_hb_ctl_path, .data = ocfs2_hb_ctl_path,
.maxlen = OCFS2_MAX_HB_CTL_PATH, .maxlen = OCFS2_MAX_HB_CTL_PATH,
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dostring, .proc_handler = proc_dostring,
}, },
{ } { }
}; };

18
fs/quota/dquot.c
View file

@ -2477,56 +2477,56 @@ static ctl_table fs_dqstats_table[] = {
.data = &dqstats.lookups, .data = &dqstats.lookups,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "drops", .procname = "drops",
.data = &dqstats.drops, .data = &dqstats.drops,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "reads", .procname = "reads",
.data = &dqstats.reads, .data = &dqstats.reads,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "writes", .procname = "writes",
.data = &dqstats.writes, .data = &dqstats.writes,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "cache_hits", .procname = "cache_hits",
.data = &dqstats.cache_hits, .data = &dqstats.cache_hits,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "allocated_dquots", .procname = "allocated_dquots",
.data = &dqstats.allocated_dquots, .data = &dqstats.allocated_dquots,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "free_dquots", .procname = "free_dquots",
.data = &dqstats.free_dquots, .data = &dqstats.free_dquots,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "syncs", .procname = "syncs",
.data = &dqstats.syncs, .data = &dqstats.syncs,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
#ifdef CONFIG_PRINT_QUOTA_WARNING #ifdef CONFIG_PRINT_QUOTA_WARNING
{ {
@ -2534,7 +2534,7 @@ static ctl_table fs_dqstats_table[] = {
.data = &flag_print_warnings, .data = &flag_print_warnings,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
#endif #endif
{ }, { },

30
fs/xfs/linux-2.6/xfs_sysctl.c
View file

@ -59,7 +59,7 @@ static ctl_table xfs_table[] = {
.data = &xfs_params.sgid_inherit.val, .data = &xfs_params.sgid_inherit.val,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xfs_params.sgid_inherit.min, .extra1 = &xfs_params.sgid_inherit.min,
.extra2 = &xfs_params.sgid_inherit.max .extra2 = &xfs_params.sgid_inherit.max
}, },
@ -68,7 +68,7 @@ static ctl_table xfs_table[] = {
.data = &xfs_params.symlink_mode.val, .data = &xfs_params.symlink_mode.val,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xfs_params.symlink_mode.min, .extra1 = &xfs_params.symlink_mode.min,
.extra2 = &xfs_params.symlink_mode.max .extra2 = &xfs_params.symlink_mode.max
}, },
@ -77,7 +77,7 @@ static ctl_table xfs_table[] = {
.data = &xfs_params.panic_mask.val, .data = &xfs_params.panic_mask.val,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xfs_params.panic_mask.min, .extra1 = &xfs_params.panic_mask.min,
.extra2 = &xfs_params.panic_mask.max .extra2 = &xfs_params.panic_mask.max
}, },
@ -87,7 +87,7 @@ static ctl_table xfs_table[] = {
.data = &xfs_params.error_level.val, .data = &xfs_params.error_level.val,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xfs_params.error_level.min, .extra1 = &xfs_params.error_level.min,
.extra2 = &xfs_params.error_level.max .extra2 = &xfs_params.error_level.max
}, },
@ -96,7 +96,7 @@ static ctl_table xfs_table[] = {
.data = &xfs_params.syncd_timer.val, .data = &xfs_params.syncd_timer.val,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xfs_params.syncd_timer.min, .extra1 = &xfs_params.syncd_timer.min,
.extra2 = &xfs_params.syncd_timer.max .extra2 = &xfs_params.syncd_timer.max
}, },
@ -105,7 +105,7 @@ static ctl_table xfs_table[] = {
.data = &xfs_params.inherit_sync.val, .data = &xfs_params.inherit_sync.val,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xfs_params.inherit_sync.min, .extra1 = &xfs_params.inherit_sync.min,
.extra2 = &xfs_params.inherit_sync.max .extra2 = &xfs_params.inherit_sync.max
}, },
@ -114,7 +114,7 @@ static ctl_table xfs_table[] = {
.data = &xfs_params.inherit_nodump.val, .data = &xfs_params.inherit_nodump.val,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xfs_params.inherit_nodump.min, .extra1 = &xfs_params.inherit_nodump.min,
.extra2 = &xfs_params.inherit_nodump.max .extra2 = &xfs_params.inherit_nodump.max
}, },
@ -123,7 +123,7 @@ static ctl_table xfs_table[] = {
.data = &xfs_params.inherit_noatim.val, .data = &xfs_params.inherit_noatim.val,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xfs_params.inherit_noatim.min, .extra1 = &xfs_params.inherit_noatim.min,
.extra2 = &xfs_params.inherit_noatim.max .extra2 = &xfs_params.inherit_noatim.max
}, },
@ -132,7 +132,7 @@ static ctl_table xfs_table[] = {
.data = &xfs_params.xfs_buf_timer.val, .data = &xfs_params.xfs_buf_timer.val,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xfs_params.xfs_buf_timer.min, .extra1 = &xfs_params.xfs_buf_timer.min,
.extra2 = &xfs_params.xfs_buf_timer.max .extra2 = &xfs_params.xfs_buf_timer.max
}, },
@ -141,7 +141,7 @@ static ctl_table xfs_table[] = {
.data = &xfs_params.xfs_buf_age.val, .data = &xfs_params.xfs_buf_age.val,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xfs_params.xfs_buf_age.min, .extra1 = &xfs_params.xfs_buf_age.min,
.extra2 = &xfs_params.xfs_buf_age.max .extra2 = &xfs_params.xfs_buf_age.max
}, },
@ -150,7 +150,7 @@ static ctl_table xfs_table[] = {
.data = &xfs_params.inherit_nosym.val, .data = &xfs_params.inherit_nosym.val,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xfs_params.inherit_nosym.min, .extra1 = &xfs_params.inherit_nosym.min,
.extra2 = &xfs_params.inherit_nosym.max .extra2 = &xfs_params.inherit_nosym.max
}, },
@ -159,7 +159,7 @@ static ctl_table xfs_table[] = {
.data = &xfs_params.rotorstep.val, .data = &xfs_params.rotorstep.val,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xfs_params.rotorstep.min, .extra1 = &xfs_params.rotorstep.min,
.extra2 = &xfs_params.rotorstep.max .extra2 = &xfs_params.rotorstep.max
}, },
@ -168,7 +168,7 @@ static ctl_table xfs_table[] = {
.data = &xfs_params.inherit_nodfrg.val, .data = &xfs_params.inherit_nodfrg.val,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xfs_params.inherit_nodfrg.min, .extra1 = &xfs_params.inherit_nodfrg.min,
.extra2 = &xfs_params.inherit_nodfrg.max .extra2 = &xfs_params.inherit_nodfrg.max
}, },
@ -177,7 +177,7 @@ static ctl_table xfs_table[] = {
.data = &xfs_params.fstrm_timer.val, .data = &xfs_params.fstrm_timer.val,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xfs_params.fstrm_timer.min, .extra1 = &xfs_params.fstrm_timer.min,
.extra2 = &xfs_params.fstrm_timer.max, .extra2 = &xfs_params.fstrm_timer.max,
}, },
@ -188,7 +188,7 @@ static ctl_table xfs_table[] = {
.data = &xfs_params.stats_clear.val, .data = &xfs_params.stats_clear.val,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &xfs_stats_clear_proc_handler, .proc_handler = xfs_stats_clear_proc_handler,
.extra1 = &xfs_params.stats_clear.min, .extra1 = &xfs_params.stats_clear.min,
.extra2 = &xfs_params.stats_clear.max .extra2 = &xfs_params.stats_clear.max
}, },

2
kernel/slow-work.c
View file

@ -74,7 +74,7 @@ ctl_table slow_work_sysctls[] = {
.data = &vslow_work_proportion, .data = &vslow_work_proportion,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = (void *) &slow_work_min_vslow, .extra1 = (void *) &slow_work_min_vslow,
.extra2 = (void *) &slow_work_max_vslow, .extra2 = (void *) &slow_work_max_vslow,
}, },

266
kernel/sysctl.c
View file

File diff suppressed because it is too large Load diff

12
net/rds/ib_sysctl.c
View file

@ -71,7 +71,7 @@ ctl_table rds_ib_sysctl_table[] = {
.data = &rds_ib_sysctl_max_send_wr, .data = &rds_ib_sysctl_max_send_wr,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_minmax, .proc_handler = proc_doulongvec_minmax,
.extra1 = &rds_ib_sysctl_max_wr_min, .extra1 = &rds_ib_sysctl_max_wr_min,
.extra2 = &rds_ib_sysctl_max_wr_max, .extra2 = &rds_ib_sysctl_max_wr_max,
}, },
@ -80,7 +80,7 @@ ctl_table rds_ib_sysctl_table[] = {
.data = &rds_ib_sysctl_max_recv_wr, .data = &rds_ib_sysctl_max_recv_wr,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_minmax, .proc_handler = proc_doulongvec_minmax,
.extra1 = &rds_ib_sysctl_max_wr_min, .extra1 = &rds_ib_sysctl_max_wr_min,
.extra2 = &rds_ib_sysctl_max_wr_max, .extra2 = &rds_ib_sysctl_max_wr_max,
}, },
@ -89,7 +89,7 @@ ctl_table rds_ib_sysctl_table[] = {
.data = &rds_ib_sysctl_max_unsig_wrs, .data = &rds_ib_sysctl_max_unsig_wrs,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_minmax, .proc_handler = proc_doulongvec_minmax,
.extra1 = &rds_ib_sysctl_max_unsig_wr_min, .extra1 = &rds_ib_sysctl_max_unsig_wr_min,
.extra2 = &rds_ib_sysctl_max_unsig_wr_max, .extra2 = &rds_ib_sysctl_max_unsig_wr_max,
}, },
@ -98,7 +98,7 @@ ctl_table rds_ib_sysctl_table[] = {
.data = &rds_ib_sysctl_max_unsig_bytes, .data = &rds_ib_sysctl_max_unsig_bytes,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_minmax, .proc_handler = proc_doulongvec_minmax,
.extra1 = &rds_ib_sysctl_max_unsig_bytes_min, .extra1 = &rds_ib_sysctl_max_unsig_bytes_min,
.extra2 = &rds_ib_sysctl_max_unsig_bytes_max, .extra2 = &rds_ib_sysctl_max_unsig_bytes_max,
}, },
@ -107,14 +107,14 @@ ctl_table rds_ib_sysctl_table[] = {
.data = &rds_ib_sysctl_max_recv_allocation, .data = &rds_ib_sysctl_max_recv_allocation,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_minmax, .proc_handler = proc_doulongvec_minmax,
}, },
{ {
.procname = "flow_control", .procname = "flow_control",
.data = &rds_ib_sysctl_flow_control, .data = &rds_ib_sysctl_flow_control,
.maxlen = sizeof(rds_ib_sysctl_flow_control), .maxlen = sizeof(rds_ib_sysctl_flow_control),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ } { }
}; };

12
net/rds/iw_sysctl.c
View file

@ -61,7 +61,7 @@ ctl_table rds_iw_sysctl_table[] = {
.data = &rds_iw_sysctl_max_send_wr, .data = &rds_iw_sysctl_max_send_wr,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_minmax, .proc_handler = proc_doulongvec_minmax,
.extra1 = &rds_iw_sysctl_max_wr_min, .extra1 = &rds_iw_sysctl_max_wr_min,
.extra2 = &rds_iw_sysctl_max_wr_max, .extra2 = &rds_iw_sysctl_max_wr_max,
}, },
@ -70,7 +70,7 @@ ctl_table rds_iw_sysctl_table[] = {
.data = &rds_iw_sysctl_max_recv_wr, .data = &rds_iw_sysctl_max_recv_wr,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_minmax, .proc_handler = proc_doulongvec_minmax,
.extra1 = &rds_iw_sysctl_max_wr_min, .extra1 = &rds_iw_sysctl_max_wr_min,
.extra2 = &rds_iw_sysctl_max_wr_max, .extra2 = &rds_iw_sysctl_max_wr_max,
}, },
@ -79,7 +79,7 @@ ctl_table rds_iw_sysctl_table[] = {
.data = &rds_iw_sysctl_max_unsig_wrs, .data = &rds_iw_sysctl_max_unsig_wrs,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_minmax, .proc_handler = proc_doulongvec_minmax,
.extra1 = &rds_iw_sysctl_max_unsig_wr_min, .extra1 = &rds_iw_sysctl_max_unsig_wr_min,
.extra2 = &rds_iw_sysctl_max_unsig_wr_max, .extra2 = &rds_iw_sysctl_max_unsig_wr_max,
}, },
@ -88,7 +88,7 @@ ctl_table rds_iw_sysctl_table[] = {
.data = &rds_iw_sysctl_max_unsig_bytes, .data = &rds_iw_sysctl_max_unsig_bytes,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_minmax, .proc_handler = proc_doulongvec_minmax,
.extra1 = &rds_iw_sysctl_max_unsig_bytes_min, .extra1 = &rds_iw_sysctl_max_unsig_bytes_min,
.extra2 = &rds_iw_sysctl_max_unsig_bytes_max, .extra2 = &rds_iw_sysctl_max_unsig_bytes_max,
}, },
@ -97,14 +97,14 @@ ctl_table rds_iw_sysctl_table[] = {
.data = &rds_iw_sysctl_max_recv_allocation, .data = &rds_iw_sysctl_max_recv_allocation,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_minmax, .proc_handler = proc_doulongvec_minmax,
}, },
{ {
.procname = "flow_control", .procname = "flow_control",
.data = &rds_iw_sysctl_flow_control, .data = &rds_iw_sysctl_flow_control,
.maxlen = sizeof(rds_iw_sysctl_flow_control), .maxlen = sizeof(rds_iw_sysctl_flow_control),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ } { }
}; };

10
net/rds/sysctl.c
View file

@ -55,7 +55,7 @@ static ctl_table rds_sysctl_rds_table[] = {
.data = &rds_sysctl_reconnect_min_jiffies, .data = &rds_sysctl_reconnect_min_jiffies,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_ms_jiffies_minmax, .proc_handler = proc_doulongvec_ms_jiffies_minmax,
.extra1 = &rds_sysctl_reconnect_min, .extra1 = &rds_sysctl_reconnect_min,
.extra2 = &rds_sysctl_reconnect_max_jiffies, .extra2 = &rds_sysctl_reconnect_max_jiffies,
}, },
@ -64,7 +64,7 @@ static ctl_table rds_sysctl_rds_table[] = {
.data = &rds_sysctl_reconnect_max_jiffies, .data = &rds_sysctl_reconnect_max_jiffies,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_ms_jiffies_minmax, .proc_handler = proc_doulongvec_ms_jiffies_minmax,
.extra1 = &rds_sysctl_reconnect_min_jiffies, .extra1 = &rds_sysctl_reconnect_min_jiffies,
.extra2 = &rds_sysctl_reconnect_max, .extra2 = &rds_sysctl_reconnect_max,
}, },
@ -73,21 +73,21 @@ static ctl_table rds_sysctl_rds_table[] = {
.data = &rds_sysctl_max_unacked_packets, .data = &rds_sysctl_max_unacked_packets,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "max_unacked_bytes", .procname = "max_unacked_bytes",
.data = &rds_sysctl_max_unacked_bytes, .data = &rds_sysctl_max_unacked_bytes,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "ping_enable", .procname = "ping_enable",
.data = &rds_sysctl_ping_enable, .data = &rds_sysctl_ping_enable,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ } { }
}; };

2
net/sctp/sysctl.c
View file

@ -237,7 +237,7 @@ static ctl_table sctp_table[] = {
.data = &sctp_scope_policy, .data = &sctp_scope_policy,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &zero, .extra1 = &zero,
.extra2 = &addr_scope_max, .extra2 = &addr_scope_max,
}, },

10
net/sunrpc/sysctl.c
View file

@ -139,34 +139,34 @@ static ctl_table debug_table[] = {
.data = &rpc_debug, .data = &rpc_debug,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dodebug .proc_handler = proc_dodebug
}, },
{ {
.procname = "nfs_debug", .procname = "nfs_debug",
.data = &nfs_debug, .data = &nfs_debug,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dodebug .proc_handler = proc_dodebug
}, },
{ {
.procname = "nfsd_debug", .procname = "nfsd_debug",
.data = &nfsd_debug, .data = &nfsd_debug,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dodebug .proc_handler = proc_dodebug
}, },
{ {
.procname = "nlm_debug", .procname = "nlm_debug",
.data = &nlm_debug, .data = &nlm_debug,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dodebug .proc_handler = proc_dodebug
}, },
{ {
.procname = "transports", .procname = "transports",
.maxlen = 256, .maxlen = 256,
.mode = 0444, .mode = 0444,
.proc_handler = &proc_do_xprt, .proc_handler = proc_do_xprt,
}, },
{ } { }
}; };

24
net/sunrpc/xprtrdma/svc_rdma.c
View file

@ -120,7 +120,7 @@ static ctl_table svcrdma_parm_table[] = {
.data = &svcrdma_max_requests, .data = &svcrdma_max_requests,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &min_max_requests, .extra1 = &min_max_requests,
.extra2 = &max_max_requests .extra2 = &max_max_requests
}, },
@ -129,7 +129,7 @@ static ctl_table svcrdma_parm_table[] = {
.data = &svcrdma_max_req_size, .data = &svcrdma_max_req_size,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &min_max_inline, .extra1 = &min_max_inline,
.extra2 = &max_max_inline .extra2 = &max_max_inline
}, },
@ -138,7 +138,7 @@ static ctl_table svcrdma_parm_table[] = {
.data = &svcrdma_ord, .data = &svcrdma_ord,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &min_ord, .extra1 = &min_ord,
.extra2 = &max_ord, .extra2 = &max_ord,
}, },
@ -148,63 +148,63 @@ static ctl_table svcrdma_parm_table[] = {
.data = &rdma_stat_read, .data = &rdma_stat_read,
.maxlen = sizeof(atomic_t), .maxlen = sizeof(atomic_t),
.mode = 0644, .mode = 0644,
.proc_handler = &read_reset_stat, .proc_handler = read_reset_stat,
}, },
{ {
.procname = "rdma_stat_recv", .procname = "rdma_stat_recv",
.data = &rdma_stat_recv, .data = &rdma_stat_recv,
.maxlen = sizeof(atomic_t), .maxlen = sizeof(atomic_t),
.mode = 0644, .mode = 0644,
.proc_handler = &read_reset_stat, .proc_handler = read_reset_stat,
}, },
{ {
.procname = "rdma_stat_write", .procname = "rdma_stat_write",
.data = &rdma_stat_write, .data = &rdma_stat_write,
.maxlen = sizeof(atomic_t), .maxlen = sizeof(atomic_t),
.mode = 0644, .mode = 0644,
.proc_handler = &read_reset_stat, .proc_handler = read_reset_stat,
}, },
{ {
.procname = "rdma_stat_sq_starve", .procname = "rdma_stat_sq_starve",
.data = &rdma_stat_sq_starve, .data = &rdma_stat_sq_starve,
.maxlen = sizeof(atomic_t), .maxlen = sizeof(atomic_t),
.mode = 0644, .mode = 0644,
.proc_handler = &read_reset_stat, .proc_handler = read_reset_stat,
}, },
{ {
.procname = "rdma_stat_rq_starve", .procname = "rdma_stat_rq_starve",
.data = &rdma_stat_rq_starve, .data = &rdma_stat_rq_starve,
.maxlen = sizeof(atomic_t), .maxlen = sizeof(atomic_t),
.mode = 0644, .mode = 0644,
.proc_handler = &read_reset_stat, .proc_handler = read_reset_stat,
}, },
{ {
.procname = "rdma_stat_rq_poll", .procname = "rdma_stat_rq_poll",
.data = &rdma_stat_rq_poll, .data = &rdma_stat_rq_poll,
.maxlen = sizeof(atomic_t), .maxlen = sizeof(atomic_t),
.mode = 0644, .mode = 0644,
.proc_handler = &read_reset_stat, .proc_handler = read_reset_stat,
}, },
{ {
.procname = "rdma_stat_rq_prod", .procname = "rdma_stat_rq_prod",
.data = &rdma_stat_rq_prod, .data = &rdma_stat_rq_prod,
.maxlen = sizeof(atomic_t), .maxlen = sizeof(atomic_t),
.mode = 0644, .mode = 0644,
.proc_handler = &read_reset_stat, .proc_handler = read_reset_stat,
}, },
{ {
.procname = "rdma_stat_sq_poll", .procname = "rdma_stat_sq_poll",
.data = &rdma_stat_sq_poll, .data = &rdma_stat_sq_poll,
.maxlen = sizeof(atomic_t), .maxlen = sizeof(atomic_t),
.mode = 0644, .mode = 0644,
.proc_handler = &read_reset_stat, .proc_handler = read_reset_stat,
}, },
{ {
.procname = "rdma_stat_sq_prod", .procname = "rdma_stat_sq_prod",
.data = &rdma_stat_sq_prod, .data = &rdma_stat_sq_prod,
.maxlen = sizeof(atomic_t), .maxlen = sizeof(atomic_t),
.mode = 0644, .mode = 0644,
.proc_handler = &read_reset_stat, .proc_handler = read_reset_stat,
}, },
{ }, { },
}; };

12
net/sunrpc/xprtrdma/transport.c
View file

@ -90,7 +90,7 @@ static ctl_table xr_tunables_table[] = {
.data = &xprt_rdma_slot_table_entries, .data = &xprt_rdma_slot_table_entries,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &min_slot_table_size, .extra1 = &min_slot_table_size,
.extra2 = &max_slot_table_size .extra2 = &max_slot_table_size
}, },
@ -99,21 +99,21 @@ static ctl_table xr_tunables_table[] = {
.data = &xprt_rdma_max_inline_read, .data = &xprt_rdma_max_inline_read,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "rdma_max_inline_write", .procname = "rdma_max_inline_write",
.data = &xprt_rdma_max_inline_write, .data = &xprt_rdma_max_inline_write,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "rdma_inline_write_padding", .procname = "rdma_inline_write_padding",
.data = &xprt_rdma_inline_write_padding, .data = &xprt_rdma_inline_write_padding,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &zero, .extra1 = &zero,
.extra2 = &max_padding, .extra2 = &max_padding,
}, },
@ -122,7 +122,7 @@ static ctl_table xr_tunables_table[] = {
.data = &xprt_rdma_memreg_strategy, .data = &xprt_rdma_memreg_strategy,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &min_memreg, .extra1 = &min_memreg,
.extra2 = &max_memreg, .extra2 = &max_memreg,
}, },
@ -131,7 +131,7 @@ static ctl_table xr_tunables_table[] = {
.data = &xprt_rdma_pad_optimize, .data = &xprt_rdma_pad_optimize,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ }, { },
}; };

10
net/sunrpc/xprtsock.c
View file

@ -85,7 +85,7 @@ static ctl_table xs_tunables_table[] = {
.data = &xprt_udp_slot_table_entries, .data = &xprt_udp_slot_table_entries,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &min_slot_table_size, .extra1 = &min_slot_table_size,
.extra2 = &max_slot_table_size .extra2 = &max_slot_table_size
}, },
@ -94,7 +94,7 @@ static ctl_table xs_tunables_table[] = {
.data = &xprt_tcp_slot_table_entries, .data = &xprt_tcp_slot_table_entries,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &min_slot_table_size, .extra1 = &min_slot_table_size,
.extra2 = &max_slot_table_size .extra2 = &max_slot_table_size
}, },
@ -103,7 +103,7 @@ static ctl_table xs_tunables_table[] = {
.data = &xprt_min_resvport, .data = &xprt_min_resvport,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xprt_min_resvport_limit, .extra1 = &xprt_min_resvport_limit,
.extra2 = &xprt_max_resvport_limit .extra2 = &xprt_max_resvport_limit
}, },
@ -112,7 +112,7 @@ static ctl_table xs_tunables_table[] = {
.data = &xprt_max_resvport, .data = &xprt_max_resvport,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &xprt_min_resvport_limit, .extra1 = &xprt_min_resvport_limit,
.extra2 = &xprt_max_resvport_limit .extra2 = &xprt_max_resvport_limit
}, },
@ -121,7 +121,7 @@ static ctl_table xs_tunables_table[] = {
.data = &xs_tcp_fin_timeout, .data = &xs_tcp_fin_timeout,
.maxlen = sizeof(xs_tcp_fin_timeout), .maxlen = sizeof(xs_tcp_fin_timeout),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_jiffies, .proc_handler = proc_dointvec_jiffies,
}, },
{ }, { },
}; };

10
security/keys/sysctl.c
View file

@ -21,7 +21,7 @@ ctl_table key_sysctls[] = {
.data = &key_quota_maxkeys, .data = &key_quota_maxkeys,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = (void *) &one, .extra1 = (void *) &one,
.extra2 = (void *) &max, .extra2 = (void *) &max,
}, },
@ -30,7 +30,7 @@ ctl_table key_sysctls[] = {
.data = &key_quota_maxbytes, .data = &key_quota_maxbytes,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = (void *) &one, .extra1 = (void *) &one,
.extra2 = (void *) &max, .extra2 = (void *) &max,
}, },
@ -39,7 +39,7 @@ ctl_table key_sysctls[] = {
.data = &key_quota_root_maxkeys, .data = &key_quota_root_maxkeys,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = (void *) &one, .extra1 = (void *) &one,
.extra2 = (void *) &max, .extra2 = (void *) &max,
}, },
@ -48,7 +48,7 @@ ctl_table key_sysctls[] = {
.data = &key_quota_root_maxbytes, .data = &key_quota_root_maxbytes,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = (void *) &one, .extra1 = (void *) &one,
.extra2 = (void *) &max, .extra2 = (void *) &max,
}, },
@ -57,7 +57,7 @@ ctl_table key_sysctls[] = {
.data = &key_gc_delay, .data = &key_gc_delay,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = (void *) &zero, .extra1 = (void *) &zero,
.extra2 = (void *) &max, .extra2 = (void *) &max,
}, },