diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2009-11-16 06:11:48 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2009-11-18 11:37:40 -0500 |
commit | 6d4561110a3e9fa742aeec6717248a491dfb1878 (patch) | |
tree | 689e2abf19940416ce597ba56ed31026ff59bd21 | |
parent | 86926d0096279b9739ceeff40f68d3c33b9119a9 (diff) |
sysctl: Drop & in front of every proc_handler.
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>
45 files changed, 339 insertions, 339 deletions
diff --git a/arch/arm/kernel/isa.c b/arch/arm/kernel/isa.c index 738dfcc658ca..346485910732 100644 --- a/arch/arm/kernel/isa.c +++ b/arch/arm/kernel/isa.c | |||
@@ -26,19 +26,19 @@ static ctl_table ctl_isa_vars[4] = { | |||
26 | .data = &isa_membase, | 26 | .data = &isa_membase, |
27 | .maxlen = sizeof(isa_membase), | 27 | .maxlen = sizeof(isa_membase), |
28 | .mode = 0444, | 28 | .mode = 0444, |
29 | .proc_handler = &proc_dointvec, | 29 | .proc_handler = proc_dointvec, |
30 | }, { | 30 | }, { |
31 | .procname = "portbase", | 31 | .procname = "portbase", |
32 | .data = &isa_portbase, | 32 | .data = &isa_portbase, |
33 | .maxlen = sizeof(isa_portbase), | 33 | .maxlen = sizeof(isa_portbase), |
34 | .mode = 0444, | 34 | .mode = 0444, |
35 | .proc_handler = &proc_dointvec, | 35 | .proc_handler = proc_dointvec, |
36 | }, { | 36 | }, { |
37 | .procname = "portshift", | 37 | .procname = "portshift", |
38 | .data = &isa_portshift, | 38 | .data = &isa_portshift, |
39 | .maxlen = sizeof(isa_portshift), | 39 | .maxlen = sizeof(isa_portshift), |
40 | .mode = 0444, | 40 | .mode = 0444, |
41 | .proc_handler = &proc_dointvec, | 41 | .proc_handler = proc_dointvec, |
42 | }, {} | 42 | }, {} |
43 | }; | 43 | }; |
44 | 44 | ||
diff --git a/arch/arm/mach-bcmring/arch.c b/arch/arm/mach-bcmring/arch.c index f3c11199707a..fbe6fa02c882 100644 --- a/arch/arm/mach-bcmring/arch.c +++ b/arch/arm/mach-bcmring/arch.c | |||
@@ -58,7 +58,7 @@ static struct ctl_table bcmring_sysctl_warm_reboot[] = { | |||
58 | .data = &bcmring_arch_warm_reboot, | 58 | .data = &bcmring_arch_warm_reboot, |
59 | .maxlen = sizeof(int), | 59 | .maxlen = sizeof(int), |
60 | .mode = 0644, | 60 | .mode = 0644, |
61 | .proc_handler = &proc_dointvec}, | 61 | .proc_handler = proc_dointvec}, |
62 | {} | 62 | {} |
63 | }; | 63 | }; |
64 | 64 | ||
diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c index 940d8bb486f8..5fa3889d858b 100644 --- a/arch/frv/kernel/pm.c +++ b/arch/frv/kernel/pm.c | |||
@@ -303,28 +303,28 @@ static struct ctl_table pm_table[] = | |||
303 | .data = NULL, | 303 | .data = NULL, |
304 | .maxlen = 0, | 304 | .maxlen = 0, |
305 | .mode = 0200, | 305 | .mode = 0200, |
306 | .proc_handler = &sysctl_pm_do_suspend, | 306 | .proc_handler = sysctl_pm_do_suspend, |
307 | }, | 307 | }, |
308 | { | 308 | { |
309 | .procname = "cmode", | 309 | .procname = "cmode", |
310 | .data = &clock_cmode_current, | 310 | .data = &clock_cmode_current, |
311 | .maxlen = sizeof(int), | 311 | .maxlen = sizeof(int), |
312 | .mode = 0644, | 312 | .mode = 0644, |
313 | .proc_handler = &cmode_procctl, | 313 | .proc_handler = cmode_procctl, |
314 | }, | 314 | }, |
315 | { | 315 | { |
316 | .procname = "p0", | 316 | .procname = "p0", |
317 | .data = &clock_p0_current, | 317 | .data = &clock_p0_current, |
318 | .maxlen = sizeof(int), | 318 | .maxlen = sizeof(int), |
319 | .mode = 0644, | 319 | .mode = 0644, |
320 | .proc_handler = &p0_procctl, | 320 | .proc_handler = p0_procctl, |
321 | }, | 321 | }, |
322 | { | 322 | { |
323 | .procname = "cm", | 323 | .procname = "cm", |
324 | .data = &clock_cm_current, | 324 | .data = &clock_cm_current, |
325 | .maxlen = sizeof(int), | 325 | .maxlen = sizeof(int), |
326 | .mode = 0644, | 326 | .mode = 0644, |
327 | .proc_handler = &cm_procctl, | 327 | .proc_handler = cm_procctl, |
328 | }, | 328 | }, |
329 | { } | 329 | { } |
330 | }; | 330 | }; |
diff --git a/arch/frv/kernel/sysctl.c b/arch/frv/kernel/sysctl.c index b30a4f2cda3e..035516cb7a97 100644 --- a/arch/frv/kernel/sysctl.c +++ b/arch/frv/kernel/sysctl.c | |||
@@ -180,7 +180,7 @@ static struct ctl_table frv_table[] = | |||
180 | .data = NULL, | 180 | .data = NULL, |
181 | .maxlen = 0, | 181 | .maxlen = 0, |
182 | .mode = 0644, | 182 | .mode = 0644, |
183 | .proc_handler = &procctl_frv_cachemode, | 183 | .proc_handler = procctl_frv_cachemode, |
184 | }, | 184 | }, |
185 | #ifdef CONFIG_MMU | 185 | #ifdef CONFIG_MMU |
186 | { | 186 | { |
@@ -188,7 +188,7 @@ static struct ctl_table frv_table[] = | |||
188 | .data = NULL, | 188 | .data = NULL, |
189 | .maxlen = 0, | 189 | .maxlen = 0, |
190 | .mode = 0644, | 190 | .mode = 0644, |
191 | .proc_handler = &procctl_frv_pin_cxnr | 191 | .proc_handler = procctl_frv_pin_cxnr |
192 | }, | 192 | }, |
193 | #endif | 193 | #endif |
194 | {} | 194 | {} |
diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c index 7c7d6a6dc0f7..b942f4032d7a 100644 --- a/arch/ia64/kernel/crash.c +++ b/arch/ia64/kernel/crash.c | |||
@@ -243,14 +243,14 @@ static ctl_table kdump_ctl_table[] = { | |||
243 | .data = &kdump_on_init, | 243 | .data = &kdump_on_init, |
244 | .maxlen = sizeof(int), | 244 | .maxlen = sizeof(int), |
245 | .mode = 0644, | 245 | .mode = 0644, |
246 | .proc_handler = &proc_dointvec, | 246 | .proc_handler = proc_dointvec, |
247 | }, | 247 | }, |
248 | { | 248 | { |
249 | .procname = "kdump_on_fatal_mca", | 249 | .procname = "kdump_on_fatal_mca", |
250 | .data = &kdump_on_fatal_mca, | 250 | .data = &kdump_on_fatal_mca, |
251 | .maxlen = sizeof(int), | 251 | .maxlen = sizeof(int), |
252 | .mode = 0644, | 252 | .mode = 0644, |
253 | .proc_handler = &proc_dointvec, | 253 | .proc_handler = proc_dointvec, |
254 | }, | 254 | }, |
255 | { } | 255 | { } |
256 | }; | 256 | }; |
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index ca30b3646405..402698b6689f 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
@@ -526,28 +526,28 @@ static ctl_table pfm_ctl_table[]={ | |||
526 | .data = &pfm_sysctl.debug, | 526 | .data = &pfm_sysctl.debug, |
527 | .maxlen = sizeof(int), | 527 | .maxlen = sizeof(int), |
528 | .mode = 0666, | 528 | .mode = 0666, |
529 | .proc_handler = &proc_dointvec, | 529 | .proc_handler = proc_dointvec, |
530 | }, | 530 | }, |
531 | { | 531 | { |
532 | .procname = "debug_ovfl", | 532 | .procname = "debug_ovfl", |
533 | .data = &pfm_sysctl.debug_ovfl, | 533 | .data = &pfm_sysctl.debug_ovfl, |
534 | .maxlen = sizeof(int), | 534 | .maxlen = sizeof(int), |
535 | .mode = 0666, | 535 | .mode = 0666, |
536 | .proc_handler = &proc_dointvec, | 536 | .proc_handler = proc_dointvec, |
537 | }, | 537 | }, |
538 | { | 538 | { |
539 | .procname = "fastctxsw", | 539 | .procname = "fastctxsw", |
540 | .data = &pfm_sysctl.fastctxsw, | 540 | .data = &pfm_sysctl.fastctxsw, |
541 | .maxlen = sizeof(int), | 541 | .maxlen = sizeof(int), |
542 | .mode = 0600, | 542 | .mode = 0600, |
543 | .proc_handler = &proc_dointvec, | 543 | .proc_handler = proc_dointvec, |
544 | }, | 544 | }, |
545 | { | 545 | { |
546 | .procname = "expert_mode", | 546 | .procname = "expert_mode", |
547 | .data = &pfm_sysctl.expert_mode, | 547 | .data = &pfm_sysctl.expert_mode, |
548 | .maxlen = sizeof(int), | 548 | .maxlen = sizeof(int), |
549 | .mode = 0600, | 549 | .mode = 0600, |
550 | .proc_handler = &proc_dointvec, | 550 | .proc_handler = proc_dointvec, |
551 | }, | 551 | }, |
552 | {} | 552 | {} |
553 | }; | 553 | }; |
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c index 1dbdd76a8c04..14b9a28a4aec 100644 --- a/arch/mips/lasat/sysctl.c +++ b/arch/mips/lasat/sysctl.c | |||
@@ -182,28 +182,28 @@ static ctl_table lasat_table[] = { | |||
182 | .data = &lasat_board_info.li_cpu_hz, | 182 | .data = &lasat_board_info.li_cpu_hz, |
183 | .maxlen = sizeof(int), | 183 | .maxlen = sizeof(int), |
184 | .mode = 0444, | 184 | .mode = 0444, |
185 | .proc_handler = &proc_dointvec, | 185 | .proc_handler = proc_dointvec, |
186 | }, | 186 | }, |
187 | { | 187 | { |
188 | .procname = "bus-hz", | 188 | .procname = "bus-hz", |
189 | .data = &lasat_board_info.li_bus_hz, | 189 | .data = &lasat_board_info.li_bus_hz, |
190 | .maxlen = sizeof(int), | 190 | .maxlen = sizeof(int), |
191 | .mode = 0444, | 191 | .mode = 0444, |
192 | .proc_handler = &proc_dointvec, | 192 | .proc_handler = proc_dointvec, |
193 | }, | 193 | }, |
194 | { | 194 | { |
195 | .procname = "bmid", | 195 | .procname = "bmid", |
196 | .data = &lasat_board_info.li_bmid, | 196 | .data = &lasat_board_info.li_bmid, |
197 | .maxlen = sizeof(int), | 197 | .maxlen = sizeof(int), |
198 | .mode = 0444, | 198 | .mode = 0444, |
199 | .proc_handler = &proc_dointvec, | 199 | .proc_handler = proc_dointvec, |
200 | }, | 200 | }, |
201 | { | 201 | { |
202 | .procname = "prid", | 202 | .procname = "prid", |
203 | .data = &lasat_board_info.li_prid, | 203 | .data = &lasat_board_info.li_prid, |
204 | .maxlen = sizeof(int), | 204 | .maxlen = sizeof(int), |
205 | .mode = 0644, | 205 | .mode = 0644, |
206 | .proc_handler = &proc_lasat_prid, | 206 | .proc_handler = proc_lasat_prid, |
207 | . }, | 207 | . }, |
208 | #ifdef CONFIG_INET | 208 | #ifdef CONFIG_INET |
209 | { | 209 | { |
@@ -211,14 +211,14 @@ static ctl_table lasat_table[] = { | |||
211 | .data = &lasat_board_info.li_eeprom_info.ipaddr, | 211 | .data = &lasat_board_info.li_eeprom_info.ipaddr, |
212 | .maxlen = sizeof(int), | 212 | .maxlen = sizeof(int), |
213 | .mode = 0644, | 213 | .mode = 0644, |
214 | .proc_handler = &proc_lasat_ip, | 214 | .proc_handler = proc_lasat_ip, |
215 | }, | 215 | }, |
216 | { | 216 | { |
217 | .procname = "netmask", | 217 | .procname = "netmask", |
218 | .data = &lasat_board_info.li_eeprom_info.netmask, | 218 | .data = &lasat_board_info.li_eeprom_info.netmask, |
219 | .maxlen = sizeof(int), | 219 | .maxlen = sizeof(int), |
220 | .mode = 0644, | 220 | .mode = 0644, |
221 | .proc_handler = &proc_lasat_ip, | 221 | .proc_handler = proc_lasat_ip, |
222 | }, | 222 | }, |
223 | #endif | 223 | #endif |
224 | { | 224 | { |
@@ -227,14 +227,14 @@ static ctl_table lasat_table[] = { | |||
227 | .maxlen = | 227 | .maxlen = |
228 | sizeof(lasat_board_info.li_eeprom_info.passwd_hash), | 228 | sizeof(lasat_board_info.li_eeprom_info.passwd_hash), |
229 | .mode = 0600, | 229 | .mode = 0600, |
230 | .proc_handler = &proc_dolasatstring, | 230 | .proc_handler = proc_dolasatstring, |
231 | }, | 231 | }, |
232 | { | 232 | { |
233 | .procname = "boot-service", | 233 | .procname = "boot-service", |
234 | .data = &lasat_boot_to_service, | 234 | .data = &lasat_boot_to_service, |
235 | .maxlen = sizeof(int), | 235 | .maxlen = sizeof(int), |
236 | .mode = 0644, | 236 | .mode = 0644, |
237 | .proc_handler = &proc_dointvec, | 237 | .proc_handler = proc_dointvec, |
238 | }, | 238 | }, |
239 | #ifdef CONFIG_DS1603 | 239 | #ifdef CONFIG_DS1603 |
240 | { | 240 | { |
@@ -242,7 +242,7 @@ static ctl_table lasat_table[] = { | |||
242 | .data = &rtctmp, | 242 | .data = &rtctmp, |
243 | .maxlen = sizeof(int), | 243 | .maxlen = sizeof(int), |
244 | .mode = 0644, | 244 | .mode = 0644, |
245 | .proc_handler = &proc_dolasatrtc, | 245 | .proc_handler = proc_dolasatrtc, |
246 | }, | 246 | }, |
247 | #endif | 247 | #endif |
248 | { | 248 | { |
@@ -250,14 +250,14 @@ static ctl_table lasat_table[] = { | |||
250 | .data = &lasat_board_info.li_namestr, | 250 | .data = &lasat_board_info.li_namestr, |
251 | .maxlen = sizeof(lasat_board_info.li_namestr), | 251 | .maxlen = sizeof(lasat_board_info.li_namestr), |
252 | .mode = 0444, | 252 | .mode = 0444, |
253 | .proc_handler = &proc_dostring, | 253 | .proc_handler = proc_dostring, |
254 | }, | 254 | }, |
255 | { | 255 | { |
256 | .procname = "typestr", | 256 | .procname = "typestr", |
257 | .data = &lasat_board_info.li_typestr, | 257 | .data = &lasat_board_info.li_typestr, |
258 | .maxlen = sizeof(lasat_board_info.li_typestr), | 258 | .maxlen = sizeof(lasat_board_info.li_typestr), |
259 | .mode = 0444, | 259 | .mode = 0444, |
260 | .proc_handler = &proc_dostring, | 260 | .proc_handler = proc_dostring, |
261 | }, | 261 | }, |
262 | {} | 262 | {} |
263 | }; | 263 | }; |
diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c index cece9e2cc5e4..049dda60e475 100644 --- a/arch/powerpc/kernel/idle.c +++ b/arch/powerpc/kernel/idle.c | |||
@@ -114,7 +114,7 @@ static ctl_table powersave_nap_ctl_table[]={ | |||
114 | .data = &powersave_nap, | 114 | .data = &powersave_nap, |
115 | .maxlen = sizeof(int), | 115 | .maxlen = sizeof(int), |
116 | .mode = 0644, | 116 | .mode = 0644, |
117 | .proc_handler = &proc_dointvec, | 117 | .proc_handler = proc_dointvec, |
118 | }, | 118 | }, |
119 | {} | 119 | {} |
120 | }; | 120 | }; |
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c index b55fd7ed1c31..495589950dc7 100644 --- a/arch/s390/appldata/appldata_base.c +++ b/arch/s390/appldata/appldata_base.c | |||
@@ -61,12 +61,12 @@ static struct ctl_table appldata_table[] = { | |||
61 | { | 61 | { |
62 | .procname = "timer", | 62 | .procname = "timer", |
63 | .mode = S_IRUGO | S_IWUSR, | 63 | .mode = S_IRUGO | S_IWUSR, |
64 | .proc_handler = &appldata_timer_handler, | 64 | .proc_handler = appldata_timer_handler, |
65 | }, | 65 | }, |
66 | { | 66 | { |
67 | .procname = "interval", | 67 | .procname = "interval", |
68 | .mode = S_IRUGO | S_IWUSR, | 68 | .mode = S_IRUGO | S_IWUSR, |
69 | .proc_handler = &appldata_interval_handler, | 69 | .proc_handler = appldata_interval_handler, |
70 | }, | 70 | }, |
71 | { }, | 71 | { }, |
72 | }; | 72 | }; |
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c index adf11260260a..071c81f179ef 100644 --- a/arch/s390/kernel/debug.c +++ b/arch/s390/kernel/debug.c | |||
@@ -897,14 +897,14 @@ static struct ctl_table s390dbf_table[] = { | |||
897 | .data = &debug_stoppable, | 897 | .data = &debug_stoppable, |
898 | .maxlen = sizeof(int), | 898 | .maxlen = sizeof(int), |
899 | .mode = S_IRUGO | S_IWUSR, | 899 | .mode = S_IRUGO | S_IWUSR, |
900 | .proc_handler = &proc_dointvec, | 900 | .proc_handler = proc_dointvec, |
901 | }, | 901 | }, |
902 | { | 902 | { |
903 | .procname = "debug_active", | 903 | .procname = "debug_active", |
904 | .data = &debug_active, | 904 | .data = &debug_active, |
905 | .maxlen = sizeof(int), | 905 | .maxlen = sizeof(int), |
906 | .mode = S_IRUGO | S_IWUSR, | 906 | .mode = S_IRUGO | S_IWUSR, |
907 | .proc_handler = &s390dbf_procactive, | 907 | .proc_handler = s390dbf_procactive, |
908 | }, | 908 | }, |
909 | { } | 909 | { } |
910 | }; | 910 | }; |
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c index dab3e4a7582e..ff58779bf7e9 100644 --- a/arch/s390/mm/cmm.c +++ b/arch/s390/mm/cmm.c | |||
@@ -343,17 +343,17 @@ static struct ctl_table cmm_table[] = { | |||
343 | { | 343 | { |
344 | .procname = "cmm_pages", | 344 | .procname = "cmm_pages", |
345 | .mode = 0644, | 345 | .mode = 0644, |
346 | .proc_handler = &cmm_pages_handler, | 346 | .proc_handler = cmm_pages_handler, |
347 | }, | 347 | }, |
348 | { | 348 | { |
349 | .procname = "cmm_timed_pages", | 349 | .procname = "cmm_timed_pages", |
350 | .mode = 0644, | 350 | .mode = 0644, |
351 | .proc_handler = &cmm_pages_handler, | 351 | .proc_handler = cmm_pages_handler, |
352 | }, | 352 | }, |
353 | { | 353 | { |
354 | .procname = "cmm_timeout", | 354 | .procname = "cmm_timeout", |
355 | .mode = 0644, | 355 | .mode = 0644, |
356 | .proc_handler = &cmm_timeout_handler, | 356 | .proc_handler = cmm_timeout_handler, |
357 | }, | 357 | }, |
358 | { } | 358 | { } |
359 | }; | 359 | }; |
diff --git a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c index 080c8ee2d862..75c0cbe2eda0 100644 --- a/arch/sh/kernel/traps_64.c +++ b/arch/sh/kernel/traps_64.c | |||
@@ -881,21 +881,21 @@ static ctl_table unaligned_table[] = { | |||
881 | .data = &kernel_mode_unaligned_fixup_count, | 881 | .data = &kernel_mode_unaligned_fixup_count, |
882 | .maxlen = sizeof(int), | 882 | .maxlen = sizeof(int), |
883 | .mode = 0644, | 883 | .mode = 0644, |
884 | .proc_handler = &proc_dointvec | 884 | .proc_handler = proc_dointvec |
885 | }, | 885 | }, |
886 | { | 886 | { |
887 | .procname = "user_reports", | 887 | .procname = "user_reports", |
888 | .data = &user_mode_unaligned_fixup_count, | 888 | .data = &user_mode_unaligned_fixup_count, |
889 | .maxlen = sizeof(int), | 889 | .maxlen = sizeof(int), |
890 | .mode = 0644, | 890 | .mode = 0644, |
891 | .proc_handler = &proc_dointvec | 891 | .proc_handler = proc_dointvec |
892 | }, | 892 | }, |
893 | { | 893 | { |
894 | .procname = "user_enable", | 894 | .procname = "user_enable", |
895 | .data = &user_mode_unaligned_fixup_enable, | 895 | .data = &user_mode_unaligned_fixup_enable, |
896 | .maxlen = sizeof(int), | 896 | .maxlen = sizeof(int), |
897 | .mode = 0644, | 897 | .mode = 0644, |
898 | .proc_handler = &proc_dointvec}, | 898 | .proc_handler = proc_dointvec}, |
899 | {} | 899 | {} |
900 | }; | 900 | }; |
901 | 901 | ||
diff --git a/crypto/proc.c b/crypto/proc.c index fe95975fc533..1c38733c224d 100644 --- a/crypto/proc.c +++ b/crypto/proc.c | |||
@@ -29,7 +29,7 @@ static struct ctl_table crypto_sysctl_table[] = { | |||
29 | .data = &fips_enabled, | 29 | .data = &fips_enabled, |
30 | .maxlen = sizeof(int), | 30 | .maxlen = sizeof(int), |
31 | .mode = 0444, | 31 | .mode = 0444, |
32 | .proc_handler = &proc_dointvec | 32 | .proc_handler = proc_dointvec |
33 | }, | 33 | }, |
34 | {} | 34 | {} |
35 | }; | 35 | }; |
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index 1872b6dc168a..e3749d0ba68b 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c | |||
@@ -3557,42 +3557,42 @@ static ctl_table cdrom_table[] = { | |||
3557 | .data = &cdrom_sysctl_settings.info, | 3557 | .data = &cdrom_sysctl_settings.info, |
3558 | .maxlen = CDROM_STR_SIZE, | 3558 | .maxlen = CDROM_STR_SIZE, |
3559 | .mode = 0444, | 3559 | .mode = 0444, |
3560 | .proc_handler = &cdrom_sysctl_info, | 3560 | .proc_handler = cdrom_sysctl_info, |
3561 | }, | 3561 | }, |
3562 | { | 3562 | { |
3563 | .procname = "autoclose", | 3563 | .procname = "autoclose", |
3564 | .data = &cdrom_sysctl_settings.autoclose, | 3564 | .data = &cdrom_sysctl_settings.autoclose, |
3565 | .maxlen = sizeof(int), | 3565 | .maxlen = sizeof(int), |
3566 | .mode = 0644, | 3566 | .mode = 0644, |
3567 | .proc_handler = &cdrom_sysctl_handler, | 3567 | .proc_handler = cdrom_sysctl_handler, |
3568 | }, | 3568 | }, |
3569 | { | 3569 | { |
3570 | .procname = "autoeject", | 3570 | .procname = "autoeject", |
3571 | .data = &cdrom_sysctl_settings.autoeject, | 3571 | .data = &cdrom_sysctl_settings.autoeject, |
3572 | .maxlen = sizeof(int), | 3572 | .maxlen = sizeof(int), |
3573 | .mode = 0644, | 3573 | .mode = 0644, |
3574 | .proc_handler = &cdrom_sysctl_handler, | 3574 | .proc_handler = cdrom_sysctl_handler, |
3575 | }, | 3575 | }, |
3576 | { | 3576 | { |
3577 | .procname = "debug", | 3577 | .procname = "debug", |
3578 | .data = &cdrom_sysctl_settings.debug, | 3578 | .data = &cdrom_sysctl_settings.debug, |
3579 | .maxlen = sizeof(int), | 3579 | .maxlen = sizeof(int), |
3580 | .mode = 0644, | 3580 | .mode = 0644, |
3581 | .proc_handler = &cdrom_sysctl_handler, | 3581 | .proc_handler = cdrom_sysctl_handler, |
3582 | }, | 3582 | }, |
3583 | { | 3583 | { |
3584 | .procname = "lock", | 3584 | .procname = "lock", |
3585 | .data = &cdrom_sysctl_settings.lock, | 3585 | .data = &cdrom_sysctl_settings.lock, |
3586 | .maxlen = sizeof(int), | 3586 | .maxlen = sizeof(int), |
3587 | .mode = 0644, | 3587 | .mode = 0644, |
3588 | .proc_handler = &cdrom_sysctl_handler, | 3588 | .proc_handler = cdrom_sysctl_handler, |
3589 | }, | 3589 | }, |
3590 | { | 3590 | { |
3591 | .procname = "check_media", | 3591 | .procname = "check_media", |
3592 | .data = &cdrom_sysctl_settings.check, | 3592 | .data = &cdrom_sysctl_settings.check, |
3593 | .maxlen = sizeof(int), | 3593 | .maxlen = sizeof(int), |
3594 | .mode = 0644, | 3594 | .mode = 0644, |
3595 | .proc_handler = &cdrom_sysctl_handler | 3595 | .proc_handler = cdrom_sysctl_handler |
3596 | }, | 3596 | }, |
3597 | { } | 3597 | { } |
3598 | }; | 3598 | }; |
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index a05a6112240b..e481c5938bad 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
@@ -679,7 +679,7 @@ static ctl_table hpet_table[] = { | |||
679 | .data = &hpet_max_freq, | 679 | .data = &hpet_max_freq, |
680 | .maxlen = sizeof(int), | 680 | .maxlen = sizeof(int), |
681 | .mode = 0644, | 681 | .mode = 0644, |
682 | .proc_handler = &proc_dointvec, | 682 | .proc_handler = proc_dointvec, |
683 | }, | 683 | }, |
684 | {} | 684 | {} |
685 | }; | 685 | }; |
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c index aa39722696dd..0dec5da000ef 100644 --- a/drivers/char/ipmi/ipmi_poweroff.c +++ b/drivers/char/ipmi/ipmi_poweroff.c | |||
@@ -664,7 +664,7 @@ static ctl_table ipmi_table[] = { | |||
664 | .data = &poweroff_powercycle, | 664 | .data = &poweroff_powercycle, |
665 | .maxlen = sizeof(poweroff_powercycle), | 665 | .maxlen = sizeof(poweroff_powercycle), |
666 | .mode = 0644, | 666 | .mode = 0644, |
667 | .proc_handler = &proc_dointvec }, | 667 | .proc_handler = proc_dointvec }, |
668 | { } | 668 | { } |
669 | }; | 669 | }; |
670 | 670 | ||
diff --git a/drivers/char/pty.c b/drivers/char/pty.c index d516e9ced3c2..d86c0bc05c1c 100644 --- a/drivers/char/pty.c +++ b/drivers/char/pty.c | |||
@@ -435,7 +435,7 @@ static struct ctl_table pty_table[] = { | |||
435 | .maxlen = sizeof(int), | 435 | .maxlen = sizeof(int), |
436 | .mode = 0644, | 436 | .mode = 0644, |
437 | .data = &pty_limit, | 437 | .data = &pty_limit, |
438 | .proc_handler = &proc_dointvec_minmax, | 438 | .proc_handler = proc_dointvec_minmax, |
439 | .extra1 = &pty_limit_min, | 439 | .extra1 = &pty_limit_min, |
440 | .extra2 = &pty_limit_max, | 440 | .extra2 = &pty_limit_max, |
441 | }, { | 441 | }, { |
@@ -443,7 +443,7 @@ static struct ctl_table pty_table[] = { | |||
443 | .maxlen = sizeof(int), | 443 | .maxlen = sizeof(int), |
444 | .mode = 0444, | 444 | .mode = 0444, |
445 | .data = &pty_count, | 445 | .data = &pty_count, |
446 | .proc_handler = &proc_dointvec, | 446 | .proc_handler = proc_dointvec, |
447 | }, | 447 | }, |
448 | {} | 448 | {} |
449 | }; | 449 | }; |
diff --git a/drivers/char/random.c b/drivers/char/random.c index bcf680f9ff58..dcd08635cf1b 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
@@ -1264,13 +1264,13 @@ ctl_table random_table[] = { | |||
1264 | .data = &sysctl_poolsize, | 1264 | .data = &sysctl_poolsize, |
1265 | .maxlen = sizeof(int), | 1265 | .maxlen = sizeof(int), |
1266 | .mode = 0444, | 1266 | .mode = 0444, |
1267 | .proc_handler = &proc_dointvec, | 1267 | .proc_handler = proc_dointvec, |
1268 | }, | 1268 | }, |
1269 | { | 1269 | { |
1270 | .procname = "entropy_avail", | 1270 | .procname = "entropy_avail", |
1271 | .maxlen = sizeof(int), | 1271 | .maxlen = sizeof(int), |
1272 | .mode = 0444, | 1272 | .mode = 0444, |
1273 | .proc_handler = &proc_dointvec, | 1273 | .proc_handler = proc_dointvec, |
1274 | .data = &input_pool.entropy_count, | 1274 | .data = &input_pool.entropy_count, |
1275 | }, | 1275 | }, |
1276 | { | 1276 | { |
@@ -1278,7 +1278,7 @@ ctl_table random_table[] = { | |||
1278 | .data = &random_read_wakeup_thresh, | 1278 | .data = &random_read_wakeup_thresh, |
1279 | .maxlen = sizeof(int), | 1279 | .maxlen = sizeof(int), |
1280 | .mode = 0644, | 1280 | .mode = 0644, |
1281 | .proc_handler = &proc_dointvec_minmax, | 1281 | .proc_handler = proc_dointvec_minmax, |
1282 | .extra1 = &min_read_thresh, | 1282 | .extra1 = &min_read_thresh, |
1283 | .extra2 = &max_read_thresh, | 1283 | .extra2 = &max_read_thresh, |
1284 | }, | 1284 | }, |
@@ -1287,7 +1287,7 @@ ctl_table random_table[] = { | |||
1287 | .data = &random_write_wakeup_thresh, | 1287 | .data = &random_write_wakeup_thresh, |
1288 | .maxlen = sizeof(int), | 1288 | .maxlen = sizeof(int), |
1289 | .mode = 0644, | 1289 | .mode = 0644, |
1290 | .proc_handler = &proc_dointvec_minmax, | 1290 | .proc_handler = proc_dointvec_minmax, |
1291 | .extra1 = &min_write_thresh, | 1291 | .extra1 = &min_write_thresh, |
1292 | .extra2 = &max_write_thresh, | 1292 | .extra2 = &max_write_thresh, |
1293 | }, | 1293 | }, |
@@ -1296,13 +1296,13 @@ ctl_table random_table[] = { | |||
1296 | .data = &sysctl_bootid, | 1296 | .data = &sysctl_bootid, |
1297 | .maxlen = 16, | 1297 | .maxlen = 16, |
1298 | .mode = 0444, | 1298 | .mode = 0444, |
1299 | .proc_handler = &proc_do_uuid, | 1299 | .proc_handler = proc_do_uuid, |
1300 | }, | 1300 | }, |
1301 | { | 1301 | { |
1302 | .procname = "uuid", | 1302 | .procname = "uuid", |
1303 | .maxlen = 16, | 1303 | .maxlen = 16, |
1304 | .mode = 0444, | 1304 | .mode = 0444, |
1305 | .proc_handler = &proc_do_uuid, | 1305 | .proc_handler = proc_do_uuid, |
1306 | }, | 1306 | }, |
1307 | { } | 1307 | { } |
1308 | }; | 1308 | }; |
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index 37bfe23c218e..95acb8c880f4 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c | |||
@@ -286,7 +286,7 @@ static ctl_table rtc_table[] = { | |||
286 | .data = &rtc_max_user_freq, | 286 | .data = &rtc_max_user_freq, |
287 | .maxlen = sizeof(int), | 287 | .maxlen = sizeof(int), |
288 | .mode = 0644, | 288 | .mode = 0644, |
289 | .proc_handler = &proc_dointvec, | 289 | .proc_handler = proc_dointvec, |
290 | }, | 290 | }, |
291 | { } | 291 | { } |
292 | }; | 292 | }; |
diff --git a/drivers/macintosh/mac_hid.c b/drivers/macintosh/mac_hid.c index 2dd29b42a49e..7b4ef5bb556b 100644 --- a/drivers/macintosh/mac_hid.c +++ b/drivers/macintosh/mac_hid.c | |||
@@ -31,21 +31,21 @@ static ctl_table mac_hid_files[] = { | |||
31 | .data = &mouse_emulate_buttons, | 31 | .data = &mouse_emulate_buttons, |
32 | .maxlen = sizeof(int), | 32 | .maxlen = sizeof(int), |
33 | .mode = 0644, | 33 | .mode = 0644, |
34 | .proc_handler = &proc_dointvec, | 34 | .proc_handler = proc_dointvec, |
35 | }, | 35 | }, |
36 | { | 36 | { |
37 | .procname = "mouse_button2_keycode", | 37 | .procname = "mouse_button2_keycode", |
38 | .data = &mouse_button2_keycode, | 38 | .data = &mouse_button2_keycode, |
39 | .maxlen = sizeof(int), | 39 | .maxlen = sizeof(int), |
40 | .mode = 0644, | 40 | .mode = 0644, |
41 | .proc_handler = &proc_dointvec, | 41 | .proc_handler = proc_dointvec, |
42 | }, | 42 | }, |
43 | { | 43 | { |
44 | .procname = "mouse_button3_keycode", | 44 | .procname = "mouse_button3_keycode", |
45 | .data = &mouse_button3_keycode, | 45 | .data = &mouse_button3_keycode, |
46 | .maxlen = sizeof(int), | 46 | .maxlen = sizeof(int), |
47 | .mode = 0644, | 47 | .mode = 0644, |
48 | .proc_handler = &proc_dointvec, | 48 | .proc_handler = proc_dointvec, |
49 | }, | 49 | }, |
50 | { } | 50 | { } |
51 | }; | 51 | }; |
diff --git a/drivers/md/md.c b/drivers/md/md.c index 1d529551e944..1d7b9a23c765 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -102,14 +102,14 @@ static ctl_table raid_table[] = { | |||
102 | .data = &sysctl_speed_limit_min, | 102 | .data = &sysctl_speed_limit_min, |
103 | .maxlen = sizeof(int), | 103 | .maxlen = sizeof(int), |
104 | .mode = S_IRUGO|S_IWUSR, | 104 | .mode = S_IRUGO|S_IWUSR, |
105 | .proc_handler = &proc_dointvec, | 105 | .proc_handler = proc_dointvec, |
106 | }, | 106 | }, |
107 | { | 107 | { |
108 | .procname = "speed_limit_max", | 108 | .procname = "speed_limit_max", |
109 | .data = &sysctl_speed_limit_max, | 109 | .data = &sysctl_speed_limit_max, |
110 | .maxlen = sizeof(int), | 110 | .maxlen = sizeof(int), |
111 | .mode = S_IRUGO|S_IWUSR, | 111 | .mode = S_IRUGO|S_IWUSR, |
112 | .proc_handler = &proc_dointvec, | 112 | .proc_handler = proc_dointvec, |
113 | }, | 113 | }, |
114 | { } | 114 | { } |
115 | }; | 115 | }; |
diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c index ce98b9373be7..832ed4c88cf7 100644 --- a/drivers/misc/sgi-xp/xpc_main.c +++ b/drivers/misc/sgi-xp/xpc_main.c | |||
@@ -93,7 +93,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = { | |||
93 | .data = &xpc_hb_interval, | 93 | .data = &xpc_hb_interval, |
94 | .maxlen = sizeof(int), | 94 | .maxlen = sizeof(int), |
95 | .mode = 0644, | 95 | .mode = 0644, |
96 | .proc_handler = &proc_dointvec_minmax, | 96 | .proc_handler = proc_dointvec_minmax, |
97 | .extra1 = &xpc_hb_min_interval, | 97 | .extra1 = &xpc_hb_min_interval, |
98 | .extra2 = &xpc_hb_max_interval}, | 98 | .extra2 = &xpc_hb_max_interval}, |
99 | { | 99 | { |
@@ -101,7 +101,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = { | |||
101 | .data = &xpc_hb_check_interval, | 101 | .data = &xpc_hb_check_interval, |
102 | .maxlen = sizeof(int), | 102 | .maxlen = sizeof(int), |
103 | .mode = 0644, | 103 | .mode = 0644, |
104 | .proc_handler = &proc_dointvec_minmax, | 104 | .proc_handler = proc_dointvec_minmax, |
105 | .extra1 = &xpc_hb_check_min_interval, | 105 | .extra1 = &xpc_hb_check_min_interval, |
106 | .extra2 = &xpc_hb_check_max_interval}, | 106 | .extra2 = &xpc_hb_check_max_interval}, |
107 | {} | 107 | {} |
@@ -116,7 +116,7 @@ static ctl_table xpc_sys_xpc_dir[] = { | |||
116 | .data = &xpc_disengage_timelimit, | 116 | .data = &xpc_disengage_timelimit, |
117 | .maxlen = sizeof(int), | 117 | .maxlen = sizeof(int), |
118 | .mode = 0644, | 118 | .mode = 0644, |
119 | .proc_handler = &proc_dointvec_minmax, | 119 | .proc_handler = proc_dointvec_minmax, |
120 | .extra1 = &xpc_disengage_min_timelimit, | 120 | .extra1 = &xpc_disengage_min_timelimit, |
121 | .extra2 = &xpc_disengage_max_timelimit}, | 121 | .extra2 = &xpc_disengage_max_timelimit}, |
122 | {} | 122 | {} |
diff --git a/drivers/net/wireless/arlan-proc.c b/drivers/net/wireless/arlan-proc.c index 66a0b330b756..b22983e6c0cf 100644 --- a/drivers/net/wireless/arlan-proc.c +++ b/drivers/net/wireless/arlan-proc.c | |||
@@ -819,15 +819,15 @@ static int arlan_sysctl_reset(ctl_table * ctl, int write, | |||
819 | #define CTBLN(card,nam) \ | 819 | #define CTBLN(card,nam) \ |
820 | { .procname = #nam,\ | 820 | { .procname = #nam,\ |
821 | .data = &(arlan_conf[card].nam),\ | 821 | .data = &(arlan_conf[card].nam),\ |
822 | .maxlen = sizeof(int), .mode = 0600, .proc_handler = &proc_dointvec} | 822 | .maxlen = sizeof(int), .mode = 0600, .proc_handler = proc_dointvec} |
823 | #ifdef ARLAN_DEBUGGING | 823 | #ifdef ARLAN_DEBUGGING |
824 | 824 | ||
825 | #define ARLAN_PROC_DEBUG_ENTRIES \ | 825 | #define ARLAN_PROC_DEBUG_ENTRIES \ |
826 | { .procname = "entry_exit_debug",\ | 826 | { .procname = "entry_exit_debug",\ |
827 | .data = &arlan_entry_and_exit_debug,\ | 827 | .data = &arlan_entry_and_exit_debug,\ |
828 | .maxlen = sizeof(int), .mode = 0600, .proc_handler = &proc_dointvec},\ | 828 | .maxlen = sizeof(int), .mode = 0600, .proc_handler = proc_dointvec},\ |
829 | { .procname = "debug", .data = &arlan_debug,\ | 829 | { .procname = "debug", .data = &arlan_debug,\ |
830 | .maxlen = sizeof(int), .mode = 0600, .proc_handler = &proc_dointvec}, | 830 | .maxlen = sizeof(int), .mode = 0600, .proc_handler = proc_dointvec}, |
831 | #else | 831 | #else |
832 | #define ARLAN_PROC_DEBUG_ENTRIES | 832 | #define ARLAN_PROC_DEBUG_ENTRIES |
833 | #endif | 833 | #endif |
@@ -864,7 +864,7 @@ static int arlan_sysctl_reset(ctl_table * ctl, int write, | |||
864 | CTBLN(cardNo, channelSet), \ | 864 | CTBLN(cardNo, channelSet), \ |
865 | { .procname = "name",\ | 865 | { .procname = "name",\ |
866 | .data = arlan_conf[cardNo].siteName,\ | 866 | .data = arlan_conf[cardNo].siteName,\ |
867 | .maxlen = 16, .mode = 0600, .proc_handler = &proc_dostring},\ | 867 | .maxlen = 16, .mode = 0600, .proc_handler = proc_dostring},\ |
868 | CTBLN(cardNo,waitTime),\ | 868 | CTBLN(cardNo,waitTime),\ |
869 | CTBLN(cardNo,lParameter),\ | 869 | CTBLN(cardNo,lParameter),\ |
870 | CTBLN(cardNo,_15),\ | 870 | CTBLN(cardNo,_15),\ |
@@ -906,35 +906,35 @@ static ctl_table arlan_conf_table0[] = | |||
906 | .data = &arlan_drive_info, | 906 | .data = &arlan_drive_info, |
907 | .maxlen = ARLAN_STR_SIZE, | 907 | .maxlen = ARLAN_STR_SIZE, |
908 | .mode = 0400, | 908 | .mode = 0400, |
909 | .proc_handler = &arlan_sysctl_infotxRing, | 909 | .proc_handler = arlan_sysctl_infotxRing, |
910 | }, | 910 | }, |
911 | { | 911 | { |
912 | .procname = "arlan0-rxRing", | 912 | .procname = "arlan0-rxRing", |
913 | .data = &arlan_drive_info, | 913 | .data = &arlan_drive_info, |
914 | .maxlen = ARLAN_STR_SIZE, | 914 | .maxlen = ARLAN_STR_SIZE, |
915 | .mode = 0400, | 915 | .mode = 0400, |
916 | .proc_handler = &arlan_sysctl_inforxRing, | 916 | .proc_handler = arlan_sysctl_inforxRing, |
917 | }, | 917 | }, |
918 | { | 918 | { |
919 | .procname = "arlan0-18", | 919 | .procname = "arlan0-18", |
920 | .data = &arlan_drive_info, | 920 | .data = &arlan_drive_info, |
921 | .maxlen = ARLAN_STR_SIZE, | 921 | .maxlen = ARLAN_STR_SIZE, |
922 | .mode = 0400, | 922 | .mode = 0400, |
923 | .proc_handler = &arlan_sysctl_info18, | 923 | .proc_handler = arlan_sysctl_info18, |
924 | }, | 924 | }, |
925 | { | 925 | { |
926 | .procname = "arlan0-ring", | 926 | .procname = "arlan0-ring", |
927 | .data = &arlan_drive_info, | 927 | .data = &arlan_drive_info, |
928 | .maxlen = ARLAN_STR_SIZE, | 928 | .maxlen = ARLAN_STR_SIZE, |
929 | .mode = 0400, | 929 | .mode = 0400, |
930 | .proc_handler = &arlan_sysctl_info161719, | 930 | .proc_handler = arlan_sysctl_info161719, |
931 | }, | 931 | }, |
932 | { | 932 | { |
933 | .procname = "arlan0-shm-cpy", | 933 | .procname = "arlan0-shm-cpy", |
934 | .data = &arlan_drive_info, | 934 | .data = &arlan_drive_info, |
935 | .maxlen = ARLAN_STR_SIZE, | 935 | .maxlen = ARLAN_STR_SIZE, |
936 | .mode = 0400, | 936 | .mode = 0400, |
937 | .proc_handler = &arlan_sysctl_info, | 937 | .proc_handler = arlan_sysctl_info, |
938 | }, | 938 | }, |
939 | #endif | 939 | #endif |
940 | { | 940 | { |
@@ -942,14 +942,14 @@ static ctl_table arlan_conf_table0[] = | |||
942 | .data = &conf_reset_result, | 942 | .data = &conf_reset_result, |
943 | .maxlen = 100, | 943 | .maxlen = 100, |
944 | .mode = 0400, | 944 | .mode = 0400, |
945 | .proc_handler = &arlan_configure | 945 | .proc_handler = arlan_configure |
946 | }, | 946 | }, |
947 | { | 947 | { |
948 | .procname = "reset0", | 948 | .procname = "reset0", |
949 | .data = &conf_reset_result, | 949 | .data = &conf_reset_result, |
950 | .maxlen = 100, | 950 | .maxlen = 100, |
951 | .mode = 0400, | 951 | .mode = 0400, |
952 | .proc_handler = &arlan_sysctl_reset, | 952 | .proc_handler = arlan_sysctl_reset, |
953 | }, | 953 | }, |
954 | { } | 954 | { } |
955 | }; | 955 | }; |
@@ -965,35 +965,35 @@ static ctl_table arlan_conf_table1[] = | |||
965 | .data = &arlan_drive_info, | 965 | .data = &arlan_drive_info, |
966 | .maxlen = ARLAN_STR_SIZE, | 966 | .maxlen = ARLAN_STR_SIZE, |
967 | .mode = 0400, | 967 | .mode = 0400, |
968 | .proc_handler = &arlan_sysctl_infotxRing, | 968 | .proc_handler = arlan_sysctl_infotxRing, |
969 | }, | 969 | }, |
970 | { | 970 | { |
971 | .procname = "arlan1-rxRing", | 971 | .procname = "arlan1-rxRing", |
972 | .data = &arlan_drive_info, | 972 | .data = &arlan_drive_info, |
973 | .maxlen = ARLAN_STR_SIZE, | 973 | .maxlen = ARLAN_STR_SIZE, |
974 | .mode = 0400, | 974 | .mode = 0400, |
975 | .proc_handler = &arlan_sysctl_inforxRing, | 975 | .proc_handler = arlan_sysctl_inforxRing, |
976 | }, | 976 | }, |
977 | { | 977 | { |
978 | .procname = "arlan1-18", | 978 | .procname = "arlan1-18", |
979 | .data = &arlan_drive_info, | 979 | .data = &arlan_drive_info, |
980 | .maxlen = ARLAN_STR_SIZE, | 980 | .maxlen = ARLAN_STR_SIZE, |
981 | .mode = 0400, | 981 | .mode = 0400, |
982 | .proc_handler = &arlan_sysctl_info18, | 982 | .proc_handler = arlan_sysctl_info18, |
983 | }, | 983 | }, |
984 | { | 984 | { |
985 | .procname = "arlan1-ring", | 985 | .procname = "arlan1-ring", |
986 | .data = &arlan_drive_info, | 986 | .data = &arlan_drive_info, |
987 | .maxlen = ARLAN_STR_SIZE, | 987 | .maxlen = ARLAN_STR_SIZE, |
988 | .mode = 0400, | 988 | .mode = 0400, |
989 | .proc_handler = &arlan_sysctl_info161719, | 989 | .proc_handler = arlan_sysctl_info161719, |
990 | }, | 990 | }, |
991 | { | 991 | { |
992 | .procname = "arlan1-shm-cpy", | 992 | .procname = "arlan1-shm-cpy", |
993 | .data = &arlan_drive_info, | 993 | .data = &arlan_drive_info, |
994 | .maxlen = ARLAN_STR_SIZE, | 994 | .maxlen = ARLAN_STR_SIZE, |
995 | .mode = 0400, | 995 | .mode = 0400, |
996 | .proc_handler = &arlan_sysctl_info, | 996 | .proc_handler = arlan_sysctl_info, |
997 | }, | 997 | }, |
998 | #endif | 998 | #endif |
999 | { | 999 | { |
@@ -1001,14 +1001,14 @@ static ctl_table arlan_conf_table1[] = | |||
1001 | .data = &conf_reset_result, | 1001 | .data = &conf_reset_result, |
1002 | .maxlen = 100, | 1002 | .maxlen = 100, |
1003 | .mode = 0400, | 1003 | .mode = 0400, |
1004 | .proc_handler = &arlan_configure, | 1004 | .proc_handler = arlan_configure, |
1005 | }, | 1005 | }, |
1006 | { | 1006 | { |
1007 | .procname = "reset1", | 1007 | .procname = "reset1", |
1008 | .data = &conf_reset_result, | 1008 | .data = &conf_reset_result, |
1009 | .maxlen = 100, | 1009 | .maxlen = 100, |
1010 | .mode = 0400, | 1010 | .mode = 0400, |
1011 | .proc_handler = &arlan_sysctl_reset, | 1011 | .proc_handler = arlan_sysctl_reset, |
1012 | }, | 1012 | }, |
1013 | { } | 1013 | { } |
1014 | }; | 1014 | }; |
@@ -1024,35 +1024,35 @@ static ctl_table arlan_conf_table2[] = | |||
1024 | .data = &arlan_drive_info, | 1024 | .data = &arlan_drive_info, |
1025 | .maxlen = ARLAN_STR_SIZE, | 1025 | .maxlen = ARLAN_STR_SIZE, |
1026 | .mode = 0400, | 1026 | .mode = 0400, |
1027 | .proc_handler = &arlan_sysctl_infotxRing, | 1027 | .proc_handler = arlan_sysctl_infotxRing, |
1028 | }, | 1028 | }, |
1029 | { | 1029 | { |
1030 | .procname = "arlan2-rxRing", | 1030 | .procname = "arlan2-rxRing", |
1031 | .data = &arlan_drive_info, | 1031 | .data = &arlan_drive_info, |
1032 | .maxlen = ARLAN_STR_SIZE, | 1032 | .maxlen = ARLAN_STR_SIZE, |
1033 | .mode = 0400, | 1033 | .mode = 0400, |
1034 | .proc_handler = &arlan_sysctl_inforxRing, | 1034 | .proc_handler = arlan_sysctl_inforxRing, |
1035 | }, | 1035 | }, |
1036 | { | 1036 | { |
1037 | .procname = "arlan2-18", | 1037 | .procname = "arlan2-18", |
1038 | .data = &arlan_drive_info, | 1038 | .data = &arlan_drive_info, |
1039 | .maxlen = ARLAN_STR_SIZE, | 1039 | .maxlen = ARLAN_STR_SIZE, |
1040 | .mode = 0400, | 1040 | .mode = 0400, |
1041 | .proc_handler = &arlan_sysctl_info18, | 1041 | .proc_handler = arlan_sysctl_info18, |
1042 | }, | 1042 | }, |
1043 | { | 1043 | { |
1044 | .procname = "arlan2-ring", | 1044 | .procname = "arlan2-ring", |
1045 | .data = &arlan_drive_info, | 1045 | .data = &arlan_drive_info, |
1046 | .maxlen = ARLAN_STR_SIZE, | 1046 | .maxlen = ARLAN_STR_SIZE, |
1047 | .mode = 0400, | 1047 | .mode = 0400, |
1048 | .proc_handler = &arlan_sysctl_info161719, | 1048 | .proc_handler = arlan_sysctl_info161719, |
1049 | }, | 1049 | }, |
1050 | { | 1050 | { |
1051 | .procname = "arlan2-shm-cpy", | 1051 | .procname = "arlan2-shm-cpy", |
1052 | .data = &arlan_drive_info, | 1052 | .data = &arlan_drive_info, |
1053 | .maxlen = ARLAN_STR_SIZE, | 1053 | .maxlen = ARLAN_STR_SIZE, |
1054 | .mode = 0400, | 1054 | .mode = 0400, |
1055 | .proc_handler = &arlan_sysctl_info, | 1055 | .proc_handler = arlan_sysctl_info, |
1056 | }, | 1056 | }, |
1057 | #endif | 1057 | #endif |
1058 | { | 1058 | { |
@@ -1060,14 +1060,14 @@ static ctl_table arlan_conf_table2[] = | |||
1060 | .data = &conf_reset_result, | 1060 | .data = &conf_reset_result, |
1061 | .maxlen = 100, | 1061 | .maxlen = 100, |
1062 | .mode = 0400, | 1062 | .mode = 0400, |
1063 | .proc_handler = &arlan_configure, | 1063 | .proc_handler = arlan_configure, |
1064 | }, | 1064 | }, |
1065 | { | 1065 | { |
1066 | .procname = "reset2", | 1066 | .procname = "reset2", |
1067 | .data = &conf_reset_result, | 1067 | .data = &conf_reset_result, |
1068 | .maxlen = 100, | 1068 | .maxlen = 100, |
1069 | .mode = 0400, | 1069 | .mode = 0400, |
1070 | .proc_handler = &arlan_sysctl_reset, | 1070 | .proc_handler = arlan_sysctl_reset, |
1071 | }, | 1071 | }, |
1072 | { } | 1072 | { } |
1073 | }; | 1073 | }; |
@@ -1083,35 +1083,35 @@ static ctl_table arlan_conf_table3[] = | |||
1083 | .data = &arlan_drive_info, | 1083 | .data = &arlan_drive_info, |
1084 | .maxlen = ARLAN_STR_SIZE, | 1084 | .maxlen = ARLAN_STR_SIZE, |
1085 | .mode = 0400, | 1085 | .mode = 0400, |
1086 | .proc_handler = &arlan_sysctl_infotxRing, | 1086 | .proc_handler = arlan_sysctl_infotxRing, |
1087 | }, | 1087 | }, |
1088 | { | 1088 | { |
1089 | .procname = "arlan3-rxRing", | 1089 | .procname = "arlan3-rxRing", |
1090 | .data = &arlan_drive_info, | 1090 | .data = &arlan_drive_info, |
1091 | .maxlen = ARLAN_STR_SIZE, | 1091 | .maxlen = ARLAN_STR_SIZE, |
1092 | .mode = 0400, | 1092 | .mode = 0400, |
1093 | .proc_handler = &arlan_sysctl_inforxRing, | 1093 | .proc_handler = arlan_sysctl_inforxRing, |
1094 | }, | 1094 | }, |
1095 | { | 1095 | { |
1096 | .procname = "arlan3-18", | 1096 | .procname = "arlan3-18", |
1097 | .data = &arlan_drive_info, | 1097 | .data = &arlan_drive_info, |
1098 | .maxlen = ARLAN_STR_SIZE, | 1098 | .maxlen = ARLAN_STR_SIZE, |
1099 | .mode = 0400, | 1099 | .mode = 0400, |
1100 | .proc_handler = &arlan_sysctl_info18, | 1100 | .proc_handler = arlan_sysctl_info18, |
1101 | }, | 1101 | }, |
1102 | { | 1102 | { |
1103 | .procname = "arlan3-ring", | 1103 | .procname = "arlan3-ring", |
1104 | .data = &arlan_drive_info, | 1104 | .data = &arlan_drive_info, |
1105 | .maxlen = ARLAN_STR_SIZE, | 1105 | .maxlen = ARLAN_STR_SIZE, |
1106 | .mode = 0400, | 1106 | .mode = 0400, |
1107 | .proc_handler = &arlan_sysctl_info161719, | 1107 | .proc_handler = arlan_sysctl_info161719, |
1108 | }, | 1108 | }, |
1109 | { | 1109 | { |
1110 | .procname = "arlan3-shm-cpy", | 1110 | .procname = "arlan3-shm-cpy", |
1111 | .data = &arlan_drive_info, | 1111 | .data = &arlan_drive_info, |
1112 | .maxlen = ARLAN_STR_SIZE, | 1112 | .maxlen = ARLAN_STR_SIZE, |
1113 | .mode = 0400, | 1113 | .mode = 0400, |
1114 | .proc_handler = &arlan_sysctl_info, | 1114 | .proc_handler = arlan_sysctl_info, |
1115 | }, | 1115 | }, |
1116 | #endif | 1116 | #endif |
1117 | { | 1117 | { |
@@ -1119,14 +1119,14 @@ static ctl_table arlan_conf_table3[] = | |||
1119 | .data = &conf_reset_result, | 1119 | .data = &conf_reset_result, |
1120 | .maxlen = 100, | 1120 | .maxlen = 100, |
1121 | .mode = 0400, | 1121 | .mode = 0400, |
1122 | .proc_handler = &arlan_configure, | 1122 | .proc_handler = arlan_configure, |
1123 | }, | 1123 | }, |
1124 | { | 1124 | { |
1125 | .procname = "reset3", | 1125 | .procname = "reset3", |
1126 | .data = &conf_reset_result, | 1126 | .data = &conf_reset_result, |
1127 | .maxlen = 100, | 1127 | .maxlen = 100, |
1128 | .mode = 0400, | 1128 | .mode = 0400, |
1129 | .proc_handler = &arlan_sysctl_reset, | 1129 | .proc_handler = arlan_sysctl_reset, |
1130 | }, | 1130 | }, |
1131 | { } | 1131 | { } |
1132 | }; | 1132 | }; |
diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c index f808bdbf1772..3f56bc086cb5 100644 --- a/drivers/parport/procfs.c +++ b/drivers/parport/procfs.c | |||
@@ -270,7 +270,7 @@ static const struct parport_sysctl_table parport_sysctl_template = { | |||
270 | .data = NULL, | 270 | .data = NULL, |
271 | .maxlen = sizeof(int), | 271 | .maxlen = sizeof(int), |
272 | .mode = 0644, | 272 | .mode = 0644, |
273 | .proc_handler = &proc_dointvec_minmax, | 273 | .proc_handler = proc_dointvec_minmax, |
274 | .extra1 = (void*) &parport_min_spintime_value, | 274 | .extra1 = (void*) &parport_min_spintime_value, |
275 | .extra2 = (void*) &parport_max_spintime_value | 275 | .extra2 = (void*) &parport_max_spintime_value |
276 | }, | 276 | }, |
@@ -279,28 +279,28 @@ static const struct parport_sysctl_table parport_sysctl_template = { | |||
279 | .data = NULL, | 279 | .data = NULL, |
280 | .maxlen = 0, | 280 | .maxlen = 0, |
281 | .mode = 0444, | 281 | .mode = 0444, |
282 | .proc_handler = &do_hardware_base_addr | 282 | .proc_handler = do_hardware_base_addr |
283 | }, | 283 | }, |
284 | { | 284 | { |
285 | .procname = "irq", | 285 | .procname = "irq", |
286 | .data = NULL, | 286 | .data = NULL, |
287 | .maxlen = 0, | 287 | .maxlen = 0, |
288 | .mode = 0444, | 288 | .mode = 0444, |
289 | .proc_handler = &do_hardware_irq | 289 | .proc_handler = do_hardware_irq |
290 | }, | 290 | }, |
291 | { | 291 | { |
292 | .procname = "dma", | 292 | .procname = "dma", |
293 | .data = NULL, | 293 | .data = NULL, |
294 | .maxlen = 0, | 294 | .maxlen = 0, |
295 | .mode = 0444, | 295 | .mode = 0444, |
296 | .proc_handler = &do_hardware_dma | 296 | .proc_handler = do_hardware_dma |
297 | }, | 297 | }, |
298 | { | 298 | { |
299 | .procname = "modes", | 299 | .procname = "modes", |
300 | .data = NULL, | 300 | .data = NULL, |
301 | .maxlen = 0, | 301 | .maxlen = 0, |
302 | .mode = 0444, | 302 | .mode = 0444, |
303 | .proc_handler = &do_hardware_modes | 303 | .proc_handler = do_hardware_modes |
304 | }, | 304 | }, |
305 | PARPORT_DEVICES_ROOT_DIR, | 305 | PARPORT_DEVICES_ROOT_DIR, |
306 | #ifdef CONFIG_PARPORT_1284 | 306 | #ifdef CONFIG_PARPORT_1284 |
@@ -309,35 +309,35 @@ static const struct parport_sysctl_table parport_sysctl_template = { | |||
309 | .data = NULL, | 309 | .data = NULL, |
310 | .maxlen = 0, | 310 | .maxlen = 0, |
311 | .mode = 0444, | 311 | .mode = 0444, |
312 | .proc_handler = &do_autoprobe | 312 | .proc_handler = do_autoprobe |
313 | }, | 313 | }, |
314 | { | 314 | { |
315 | .procname = "autoprobe0", | 315 | .procname = "autoprobe0", |
316 | .data = NULL, | 316 | .data = NULL, |
317 | .maxlen = 0, | 317 | .maxlen = 0, |
318 | .mode = 0444, | 318 | .mode = 0444, |
319 | .proc_handler = &do_autoprobe | 319 | .proc_handler = do_autoprobe |
320 | }, | 320 | }, |
321 | { | 321 | { |
322 | .procname = "autoprobe1", | 322 | .procname = "autoprobe1", |
323 | .data = NULL, | 323 | .data = NULL, |
324 | .maxlen = 0, | 324 | .maxlen = 0, |
325 | .mode = 0444, | 325 | .mode = 0444, |
326 | .proc_handler = &do_autoprobe | 326 | .proc_handler = do_autoprobe |
327 | }, | 327 | }, |
328 | { | 328 | { |
329 | .procname = "autoprobe2", | 329 | .procname = "autoprobe2", |
330 | .data = NULL, | 330 | .data = NULL, |
331 | .maxlen = 0, | 331 | .maxlen = 0, |
332 | .mode = 0444, | 332 | .mode = 0444, |
333 | .proc_handler = &do_autoprobe | 333 | .proc_handler = do_autoprobe |
334 | }, | 334 | }, |
335 | { | 335 | { |
336 | .procname = "autoprobe3", | 336 | .procname = "autoprobe3", |
337 | .data = NULL, | 337 | .data = NULL, |
338 | .maxlen = 0, | 338 | .maxlen = 0, |
339 | .mode = 0444, | 339 | .mode = 0444, |
340 | .proc_handler = &do_autoprobe | 340 | .proc_handler = do_autoprobe |
341 | }, | 341 | }, |
342 | #endif /* IEEE 1284 support */ | 342 | #endif /* IEEE 1284 support */ |
343 | {} | 343 | {} |
@@ -348,7 +348,7 @@ static const struct parport_sysctl_table parport_sysctl_template = { | |||
348 | .data = NULL, | 348 | .data = NULL, |
349 | .maxlen = 0, | 349 | .maxlen = 0, |
350 | .mode = 0444, | 350 | .mode = 0444, |
351 | .proc_handler = &do_active_device | 351 | .proc_handler = do_active_device |
352 | }, | 352 | }, |
353 | {} | 353 | {} |
354 | }, | 354 | }, |
@@ -386,7 +386,7 @@ parport_device_sysctl_template = { | |||
386 | .data = NULL, | 386 | .data = NULL, |
387 | .maxlen = sizeof(unsigned long), | 387 | .maxlen = sizeof(unsigned long), |
388 | .mode = 0644, | 388 | .mode = 0644, |
389 | .proc_handler = &proc_doulongvec_ms_jiffies_minmax, | 389 | .proc_handler = proc_doulongvec_ms_jiffies_minmax, |
390 | .extra1 = (void*) &parport_min_timeslice_value, | 390 | .extra1 = (void*) &parport_min_timeslice_value, |
391 | .extra2 = (void*) &parport_max_timeslice_value | 391 | .extra2 = (void*) &parport_max_timeslice_value |
392 | }, | 392 | }, |
@@ -437,7 +437,7 @@ parport_default_sysctl_table = { | |||
437 | .data = &parport_default_timeslice, | 437 | .data = &parport_default_timeslice, |
438 | .maxlen = sizeof(parport_default_timeslice), | 438 | .maxlen = sizeof(parport_default_timeslice), |
439 | .mode = 0644, | 439 | .mode = 0644, |
440 | .proc_handler = &proc_doulongvec_ms_jiffies_minmax, | 440 | .proc_handler = proc_doulongvec_ms_jiffies_minmax, |
441 | .extra1 = (void*) &parport_min_timeslice_value, | 441 | .extra1 = (void*) &parport_min_timeslice_value, |
442 | .extra2 = (void*) &parport_max_timeslice_value | 442 | .extra2 = (void*) &parport_max_timeslice_value |
443 | }, | 443 | }, |
@@ -446,7 +446,7 @@ parport_default_sysctl_table = { | |||
446 | .data = &parport_default_spintime, | 446 | .data = &parport_default_spintime, |
447 | .maxlen = sizeof(parport_default_spintime), | 447 | .maxlen = sizeof(parport_default_spintime), |
448 | .mode = 0644, | 448 | .mode = 0644, |
449 | .proc_handler = &proc_dointvec_minmax, | 449 | .proc_handler = proc_dointvec_minmax, |
450 | .extra1 = (void*) &parport_min_spintime_value, | 450 | .extra1 = (void*) &parport_min_spintime_value, |
451 | .extra2 = (void*) &parport_max_spintime_value | 451 | .extra2 = (void*) &parport_max_spintime_value |
452 | }, | 452 | }, |
diff --git a/drivers/scsi/scsi_sysctl.c b/drivers/scsi/scsi_sysctl.c index 42c31bee7113..2b6b93f7d8ef 100644 --- a/drivers/scsi/scsi_sysctl.c +++ b/drivers/scsi/scsi_sysctl.c | |||
@@ -17,7 +17,7 @@ static ctl_table scsi_table[] = { | |||
17 | .data = &scsi_logging_level, | 17 | .data = &scsi_logging_level, |
18 | .maxlen = sizeof(scsi_logging_level), | 18 | .maxlen = sizeof(scsi_logging_level), |
19 | .mode = 0644, | 19 | .mode = 0644, |
20 | .proc_handler = &proc_dointvec }, | 20 | .proc_handler = proc_dointvec }, |
21 | { } | 21 | { } |
22 | }; | 22 | }; |
23 | 23 | ||
diff --git a/fs/coda/sysctl.c b/fs/coda/sysctl.c index 354c050d4263..c6405ce3c50e 100644 --- a/fs/coda/sysctl.c +++ b/fs/coda/sysctl.c | |||
@@ -21,21 +21,21 @@ static ctl_table coda_table[] = { | |||
21 | .data = &coda_timeout, | 21 | .data = &coda_timeout, |
22 | .maxlen = sizeof(int), | 22 | .maxlen = sizeof(int), |
23 | .mode = 0644, | 23 | .mode = 0644, |
24 | .proc_handler = &proc_dointvec | 24 | .proc_handler = proc_dointvec |
25 | }, | 25 | }, |
26 | { | 26 | { |
27 | .procname = "hard", | 27 | .procname = "hard", |
28 | .data = &coda_hard, | 28 | .data = &coda_hard, |
29 | .maxlen = sizeof(int), | 29 | .maxlen = sizeof(int), |
30 | .mode = 0644, | 30 | .mode = 0644, |
31 | .proc_handler = &proc_dointvec | 31 | .proc_handler = proc_dointvec |
32 | }, | 32 | }, |
33 | { | 33 | { |
34 | .procname = "fake_statfs", | 34 | .procname = "fake_statfs", |
35 | .data = &coda_fake_statfs, | 35 | .data = &coda_fake_statfs, |
36 | .maxlen = sizeof(int), | 36 | .maxlen = sizeof(int), |
37 | .mode = 0600, | 37 | .mode = 0600, |
38 | .proc_handler = &proc_dointvec | 38 | .proc_handler = proc_dointvec |
39 | }, | 39 | }, |
40 | {} | 40 | {} |
41 | }; | 41 | }; |
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 70aa66c96c51..366c503f9657 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c | |||
@@ -251,7 +251,7 @@ ctl_table epoll_table[] = { | |||
251 | .data = &max_user_watches, | 251 | .data = &max_user_watches, |
252 | .maxlen = sizeof(int), | 252 | .maxlen = sizeof(int), |
253 | .mode = 0644, | 253 | .mode = 0644, |
254 | .proc_handler = &proc_dointvec_minmax, | 254 | .proc_handler = proc_dointvec_minmax, |
255 | .extra1 = &zero, | 255 | .extra1 = &zero, |
256 | }, | 256 | }, |
257 | { } | 257 | { } |
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 307ed4c3e1f5..e50cfa3d9654 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c | |||
@@ -375,7 +375,7 @@ static ctl_table nlm_sysctls[] = { | |||
375 | .data = &nlm_grace_period, | 375 | .data = &nlm_grace_period, |
376 | .maxlen = sizeof(unsigned long), | 376 | .maxlen = sizeof(unsigned long), |
377 | .mode = 0644, | 377 | .mode = 0644, |
378 | .proc_handler = &proc_doulongvec_minmax, | 378 | .proc_handler = proc_doulongvec_minmax, |
379 | .extra1 = (unsigned long *) &nlm_grace_period_min, | 379 | .extra1 = (unsigned long *) &nlm_grace_period_min, |
380 | .extra2 = (unsigned long *) &nlm_grace_period_max, | 380 | .extra2 = (unsigned long *) &nlm_grace_period_max, |
381 | }, | 381 | }, |
@@ -384,7 +384,7 @@ static ctl_table nlm_sysctls[] = { | |||
384 | .data = &nlm_timeout, | 384 | .data = &nlm_timeout, |
385 | .maxlen = sizeof(unsigned long), | 385 | .maxlen = sizeof(unsigned long), |
386 | .mode = 0644, | 386 | .mode = 0644, |
387 | .proc_handler = &proc_doulongvec_minmax, | 387 | .proc_handler = proc_doulongvec_minmax, |
388 | .extra1 = (unsigned long *) &nlm_timeout_min, | 388 | .extra1 = (unsigned long *) &nlm_timeout_min, |
389 | .extra2 = (unsigned long *) &nlm_timeout_max, | 389 | .extra2 = (unsigned long *) &nlm_timeout_max, |
390 | }, | 390 | }, |
@@ -393,7 +393,7 @@ static ctl_table nlm_sysctls[] = { | |||
393 | .data = &nlm_udpport, | 393 | .data = &nlm_udpport, |
394 | .maxlen = sizeof(int), | 394 | .maxlen = sizeof(int), |
395 | .mode = 0644, | 395 | .mode = 0644, |
396 | .proc_handler = &proc_dointvec_minmax, | 396 | .proc_handler = proc_dointvec_minmax, |
397 | .extra1 = (int *) &nlm_port_min, | 397 | .extra1 = (int *) &nlm_port_min, |
398 | .extra2 = (int *) &nlm_port_max, | 398 | .extra2 = (int *) &nlm_port_max, |
399 | }, | 399 | }, |
@@ -402,7 +402,7 @@ static ctl_table nlm_sysctls[] = { | |||
402 | .data = &nlm_tcpport, | 402 | .data = &nlm_tcpport, |
403 | .maxlen = sizeof(int), | 403 | .maxlen = sizeof(int), |
404 | .mode = 0644, | 404 | .mode = 0644, |
405 | .proc_handler = &proc_dointvec_minmax, | 405 | .proc_handler = proc_dointvec_minmax, |
406 | .extra1 = (int *) &nlm_port_min, | 406 | .extra1 = (int *) &nlm_port_min, |
407 | .extra2 = (int *) &nlm_port_max, | 407 | .extra2 = (int *) &nlm_port_max, |
408 | }, | 408 | }, |
@@ -411,14 +411,14 @@ static ctl_table nlm_sysctls[] = { | |||
411 | .data = &nsm_use_hostnames, | 411 | .data = &nsm_use_hostnames, |
412 | .maxlen = sizeof(int), | 412 | .maxlen = sizeof(int), |
413 | .mode = 0644, | 413 | .mode = 0644, |
414 | .proc_handler = &proc_dointvec, | 414 | .proc_handler = proc_dointvec, |
415 | }, | 415 | }, |
416 | { | 416 | { |
417 | .procname = "nsm_local_state", | 417 | .procname = "nsm_local_state", |
418 | .data = &nsm_local_state, | 418 | .data = &nsm_local_state, |
419 | .maxlen = sizeof(int), | 419 | .maxlen = sizeof(int), |
420 | .mode = 0644, | 420 | .mode = 0644, |
421 | .proc_handler = &proc_dointvec, | 421 | .proc_handler = proc_dointvec, |
422 | }, | 422 | }, |
423 | { } | 423 | { } |
424 | }; | 424 | }; |
diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c index af51e6af2072..70e1fbbaaeab 100644 --- a/fs/nfs/sysctl.c +++ b/fs/nfs/sysctl.c | |||
@@ -26,7 +26,7 @@ static ctl_table nfs_cb_sysctls[] = { | |||
26 | .data = &nfs_callback_set_tcpport, | 26 | .data = &nfs_callback_set_tcpport, |
27 | .maxlen = sizeof(int), | 27 | .maxlen = sizeof(int), |
28 | .mode = 0644, | 28 | .mode = 0644, |
29 | .proc_handler = &proc_dointvec_minmax, | 29 | .proc_handler = proc_dointvec_minmax, |
30 | .extra1 = (int *)&nfs_set_port_min, | 30 | .extra1 = (int *)&nfs_set_port_min, |
31 | .extra2 = (int *)&nfs_set_port_max, | 31 | .extra2 = (int *)&nfs_set_port_max, |
32 | }, | 32 | }, |
@@ -35,7 +35,7 @@ static ctl_table nfs_cb_sysctls[] = { | |||
35 | .data = &nfs_idmap_cache_timeout, | 35 | .data = &nfs_idmap_cache_timeout, |
36 | .maxlen = sizeof(int), | 36 | .maxlen = sizeof(int), |
37 | .mode = 0644, | 37 | .mode = 0644, |
38 | .proc_handler = &proc_dointvec_jiffies, | 38 | .proc_handler = proc_dointvec_jiffies, |
39 | }, | 39 | }, |
40 | #endif | 40 | #endif |
41 | { | 41 | { |
@@ -43,14 +43,14 @@ static ctl_table nfs_cb_sysctls[] = { | |||
43 | .data = &nfs_mountpoint_expiry_timeout, | 43 | .data = &nfs_mountpoint_expiry_timeout, |
44 | .maxlen = sizeof(nfs_mountpoint_expiry_timeout), | 44 | .maxlen = sizeof(nfs_mountpoint_expiry_timeout), |
45 | .mode = 0644, | 45 | .mode = 0644, |
46 | .proc_handler = &proc_dointvec_jiffies, | 46 | .proc_handler = proc_dointvec_jiffies, |
47 | }, | 47 | }, |
48 | { | 48 | { |
49 | .procname = "nfs_congestion_kb", | 49 | .procname = "nfs_congestion_kb", |
50 | .data = &nfs_congestion_kb, | 50 | .data = &nfs_congestion_kb, |
51 | .maxlen = sizeof(nfs_congestion_kb), | 51 | .maxlen = sizeof(nfs_congestion_kb), |
52 | .mode = 0644, | 52 | .mode = 0644, |
53 | .proc_handler = &proc_dointvec, | 53 | .proc_handler = proc_dointvec, |
54 | }, | 54 | }, |
55 | { } | 55 | { } |
56 | }; | 56 | }; |
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c index 5275921ed1ce..1d1d1a2765dd 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c | |||
@@ -73,7 +73,7 @@ ctl_table inotify_table[] = { | |||
73 | .data = &inotify_max_user_instances, | 73 | .data = &inotify_max_user_instances, |
74 | .maxlen = sizeof(int), | 74 | .maxlen = sizeof(int), |
75 | .mode = 0644, | 75 | .mode = 0644, |
76 | .proc_handler = &proc_dointvec_minmax, | 76 | .proc_handler = proc_dointvec_minmax, |
77 | .extra1 = &zero, | 77 | .extra1 = &zero, |
78 | }, | 78 | }, |
79 | { | 79 | { |
@@ -81,7 +81,7 @@ ctl_table inotify_table[] = { | |||
81 | .data = &inotify_max_user_watches, | 81 | .data = &inotify_max_user_watches, |
82 | .maxlen = sizeof(int), | 82 | .maxlen = sizeof(int), |
83 | .mode = 0644, | 83 | .mode = 0644, |
84 | .proc_handler = &proc_dointvec_minmax, | 84 | .proc_handler = proc_dointvec_minmax, |
85 | .extra1 = &zero, | 85 | .extra1 = &zero, |
86 | }, | 86 | }, |
87 | { | 87 | { |
@@ -89,7 +89,7 @@ ctl_table inotify_table[] = { | |||
89 | .data = &inotify_max_queued_events, | 89 | .data = &inotify_max_queued_events, |
90 | .maxlen = sizeof(int), | 90 | .maxlen = sizeof(int), |
91 | .mode = 0644, | 91 | .mode = 0644, |
92 | .proc_handler = &proc_dointvec_minmax, | 92 | .proc_handler = proc_dointvec_minmax, |
93 | .extra1 = &zero | 93 | .extra1 = &zero |
94 | }, | 94 | }, |
95 | { } | 95 | { } |
diff --git a/fs/ntfs/sysctl.c b/fs/ntfs/sysctl.c index 99612ea690c2..79a89184cb5e 100644 --- a/fs/ntfs/sysctl.c +++ b/fs/ntfs/sysctl.c | |||
@@ -40,7 +40,7 @@ static ctl_table ntfs_sysctls[] = { | |||
40 | .data = &debug_msgs, /* Data pointer and size. */ | 40 | .data = &debug_msgs, /* Data pointer and size. */ |
41 | .maxlen = sizeof(debug_msgs), | 41 | .maxlen = sizeof(debug_msgs), |
42 | .mode = 0644, /* Mode, proc handler. */ | 42 | .mode = 0644, /* Mode, proc handler. */ |
43 | .proc_handler = &proc_dointvec | 43 | .proc_handler = proc_dointvec |
44 | }, | 44 | }, |
45 | {} | 45 | {} |
46 | }; | 46 | }; |
diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c index ed12c1161479..f3df0baa9a48 100644 --- a/fs/ocfs2/stackglue.c +++ b/fs/ocfs2/stackglue.c | |||
@@ -624,7 +624,7 @@ static ctl_table ocfs2_nm_table[] = { | |||
624 | .data = ocfs2_hb_ctl_path, | 624 | .data = ocfs2_hb_ctl_path, |
625 | .maxlen = OCFS2_MAX_HB_CTL_PATH, | 625 | .maxlen = OCFS2_MAX_HB_CTL_PATH, |
626 | .mode = 0644, | 626 | .mode = 0644, |
627 | .proc_handler = &proc_dostring, | 627 | .proc_handler = proc_dostring, |
628 | }, | 628 | }, |
629 | { } | 629 | { } |
630 | }; | 630 | }; |
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 60940f8709d6..f0eb200d8f8e 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c | |||
@@ -2477,56 +2477,56 @@ static ctl_table fs_dqstats_table[] = { | |||
2477 | .data = &dqstats.lookups, | 2477 | .data = &dqstats.lookups, |
2478 | .maxlen = sizeof(int), | 2478 | .maxlen = sizeof(int), |
2479 | .mode = 0444, | 2479 | .mode = 0444, |
2480 | .proc_handler = &proc_dointvec, | 2480 | .proc_handler = proc_dointvec, |
2481 | }, | 2481 | }, |
2482 | { | 2482 | { |
2483 | .procname = "drops", | 2483 | .procname = "drops", |
2484 | .data = &dqstats.drops, | 2484 | .data = &dqstats.drops, |
2485 | .maxlen = sizeof(int), | 2485 | .maxlen = sizeof(int), |
2486 | .mode = 0444, | 2486 | .mode = 0444, |
2487 | .proc_handler = &proc_dointvec, | 2487 | .proc_handler = proc_dointvec, |
2488 | }, | 2488 | }, |
2489 | { | 2489 | { |
2490 | .procname = "reads", | 2490 | .procname = "reads", |
2491 | .data = &dqstats.reads, | 2491 | .data = &dqstats.reads, |
2492 | .maxlen = sizeof(int), | 2492 | .maxlen = sizeof(int), |
2493 | .mode = 0444, | 2493 | .mode = 0444, |
2494 | .proc_handler = &proc_dointvec, | 2494 | .proc_handler = proc_dointvec, |
2495 | }, | 2495 | }, |
2496 | { | 2496 | { |
2497 | .procname = "writes", | 2497 | .procname = "writes", |
2498 | .data = &dqstats.writes, | 2498 | .data = &dqstats.writes, |
2499 | .maxlen = sizeof(int), | 2499 | .maxlen = sizeof(int), |
2500 | .mode = 0444, | 2500 | .mode = 0444, |
2501 | .proc_handler = &proc_dointvec, | 2501 | .proc_handler = proc_dointvec, |
2502 | }, | 2502 | }, |
2503 | { | 2503 | { |
2504 | .procname = "cache_hits", | 2504 | .procname = "cache_hits", |
2505 | .data = &dqstats.cache_hits, | 2505 | .data = &dqstats.cache_hits, |
2506 | .maxlen = sizeof(int), | 2506 | .maxlen = sizeof(int), |
2507 | .mode = 0444, | 2507 | .mode = 0444, |
2508 | .proc_handler = &proc_dointvec, | 2508 | .proc_handler = proc_dointvec, |
2509 | }, | 2509 | }, |
2510 | { | 2510 | { |
2511 | .procname = "allocated_dquots", | 2511 | .procname = "allocated_dquots", |
2512 | .data = &dqstats.allocated_dquots, | 2512 | .data = &dqstats.allocated_dquots, |
2513 | .maxlen = sizeof(int), | 2513 | .maxlen = sizeof(int), |
2514 | .mode = 0444, | 2514 | .mode = 0444, |
2515 | .proc_handler = &proc_dointvec, | 2515 | .proc_handler = proc_dointvec, |
2516 | }, | 2516 | }, |
2517 | { | 2517 | { |
2518 | .procname = "free_dquots", | 2518 | .procname = "free_dquots", |
2519 | .data = &dqstats.free_dquots, | 2519 | .data = &dqstats.free_dquots, |
2520 | .maxlen = sizeof(int), | 2520 | .maxlen = sizeof(int), |
2521 | .mode = 0444, | 2521 | .mode = 0444, |
2522 | .proc_handler = &proc_dointvec, | 2522 | .proc_handler = proc_dointvec, |
2523 | }, | 2523 | }, |
2524 | { | 2524 | { |
2525 | .procname = "syncs", | 2525 | .procname = "syncs", |
2526 | .data = &dqstats.syncs, | 2526 | .data = &dqstats.syncs, |
2527 | .maxlen = sizeof(int), | 2527 | .maxlen = sizeof(int), |
2528 | .mode = 0444, | 2528 | .mode = 0444, |
2529 | .proc_handler = &proc_dointvec, | 2529 | .proc_handler = proc_dointvec, |
2530 | }, | 2530 | }, |
2531 | #ifdef CONFIG_PRINT_QUOTA_WARNING | 2531 | #ifdef CONFIG_PRINT_QUOTA_WARNING |
2532 | { | 2532 | { |
@@ -2534,7 +2534,7 @@ static ctl_table fs_dqstats_table[] = { | |||
2534 | .data = &flag_print_warnings, | 2534 | .data = &flag_print_warnings, |
2535 | .maxlen = sizeof(int), | 2535 | .maxlen = sizeof(int), |
2536 | .mode = 0644, | 2536 | .mode = 0644, |
2537 | .proc_handler = &proc_dointvec, | 2537 | .proc_handler = proc_dointvec, |
2538 | }, | 2538 | }, |
2539 | #endif | 2539 | #endif |
2540 | { }, | 2540 | { }, |
diff --git a/fs/xfs/linux-2.6/xfs_sysctl.c b/fs/xfs/linux-2.6/xfs_sysctl.c index 6880147cafa8..7bb5092d6ae4 100644 --- a/fs/xfs/linux-2.6/xfs_sysctl.c +++ b/fs/xfs/linux-2.6/xfs_sysctl.c | |||
@@ -59,7 +59,7 @@ static ctl_table xfs_table[] = { | |||
59 | .data = &xfs_params.sgid_inherit.val, | 59 | .data = &xfs_params.sgid_inherit.val, |
60 | .maxlen = sizeof(int), | 60 | .maxlen = sizeof(int), |
61 | .mode = 0644, | 61 | .mode = 0644, |
62 | .proc_handler = &proc_dointvec_minmax, | 62 | .proc_handler = proc_dointvec_minmax, |
63 | .extra1 = &xfs_params.sgid_inherit.min, | 63 | .extra1 = &xfs_params.sgid_inherit.min, |
64 | .extra2 = &xfs_params.sgid_inherit.max | 64 | .extra2 = &xfs_params.sgid_inherit.max |
65 | }, | 65 | }, |
@@ -68,7 +68,7 @@ static ctl_table xfs_table[] = { | |||
68 | .data = &xfs_params.symlink_mode.val, | 68 | .data = &xfs_params.symlink_mode.val, |
69 | .maxlen = sizeof(int), | 69 | .maxlen = sizeof(int), |
70 | .mode = 0644, | 70 | .mode = 0644, |
71 | .proc_handler = &proc_dointvec_minmax, | 71 | .proc_handler = proc_dointvec_minmax, |
72 | .extra1 = &xfs_params.symlink_mode.min, | 72 | .extra1 = &xfs_params.symlink_mode.min, |
73 | .extra2 = &xfs_params.symlink_mode.max | 73 | .extra2 = &xfs_params.symlink_mode.max |
74 | }, | 74 | }, |
@@ -77,7 +77,7 @@ static ctl_table xfs_table[] = { | |||
77 | .data = &xfs_params.panic_mask.val, | 77 | .data = &xfs_params.panic_mask.val, |
78 | .maxlen = sizeof(int), | 78 | .maxlen = sizeof(int), |
79 | .mode = 0644, | 79 | .mode = 0644, |
80 | .proc_handler = &proc_dointvec_minmax, | 80 | .proc_handler = proc_dointvec_minmax, |
81 | .extra1 = &xfs_params.panic_mask.min, | 81 | .extra1 = &xfs_params.panic_mask.min, |
82 | .extra2 = &xfs_params.panic_mask.max | 82 | .extra2 = &xfs_params.panic_mask.max |
83 | }, | 83 | }, |
@@ -87,7 +87,7 @@ static ctl_table xfs_table[] = { | |||
87 | .data = &xfs_params.error_level.val, | 87 | .data = &xfs_params.error_level.val, |
88 | .maxlen = sizeof(int), | 88 | .maxlen = sizeof(int), |
89 | .mode = 0644, | 89 | .mode = 0644, |
90 | .proc_handler = &proc_dointvec_minmax, | 90 | .proc_handler = proc_dointvec_minmax, |
91 | .extra1 = &xfs_params.error_level.min, | 91 | .extra1 = &xfs_params.error_level.min, |
92 | .extra2 = &xfs_params.error_level.max | 92 | .extra2 = &xfs_params.error_level.max |
93 | }, | 93 | }, |
@@ -96,7 +96,7 @@ static ctl_table xfs_table[] = { | |||
96 | .data = &xfs_params.syncd_timer.val, | 96 | .data = &xfs_params.syncd_timer.val, |
97 | .maxlen = sizeof(int), | 97 | .maxlen = sizeof(int), |
98 | .mode = 0644, | 98 | .mode = 0644, |
99 | .proc_handler = &proc_dointvec_minmax, | 99 | .proc_handler = proc_dointvec_minmax, |
100 | .extra1 = &xfs_params.syncd_timer.min, | 100 | .extra1 = &xfs_params.syncd_timer.min, |
101 | .extra2 = &xfs_params.syncd_timer.max | 101 | .extra2 = &xfs_params.syncd_timer.max |
102 | }, | 102 | }, |
@@ -105,7 +105,7 @@ static ctl_table xfs_table[] = { | |||
105 | .data = &xfs_params.inherit_sync.val, | 105 | .data = &xfs_params.inherit_sync.val, |
106 | .maxlen = sizeof(int), | 106 | .maxlen = sizeof(int), |
107 | .mode = 0644, | 107 | .mode = 0644, |
108 | .proc_handler = &proc_dointvec_minmax, | 108 | .proc_handler = proc_dointvec_minmax, |
109 | .extra1 = &xfs_params.inherit_sync.min, | 109 | .extra1 = &xfs_params.inherit_sync.min, |
110 | .extra2 = &xfs_params.inherit_sync.max | 110 | .extra2 = &xfs_params.inherit_sync.max |
111 | }, | 111 | }, |
@@ -114,7 +114,7 @@ static ctl_table xfs_table[] = { | |||
114 | .data = &xfs_params.inherit_nodump.val, | 114 | .data = &xfs_params.inherit_nodump.val, |
115 | .maxlen = sizeof(int), | 115 | .maxlen = sizeof(int), |
116 | .mode = 0644, | 116 | .mode = 0644, |
117 | .proc_handler = &proc_dointvec_minmax, | 117 | .proc_handler = proc_dointvec_minmax, |
118 | .extra1 = &xfs_params.inherit_nodump.min, | 118 | .extra1 = &xfs_params.inherit_nodump.min, |
119 | .extra2 = &xfs_params.inherit_nodump.max | 119 | .extra2 = &xfs_params.inherit_nodump.max |
120 | }, | 120 | }, |
@@ -123,7 +123,7 @@ static ctl_table xfs_table[] = { | |||
123 | .data = &xfs_params.inherit_noatim.val, | 123 | .data = &xfs_params.inherit_noatim.val, |
124 | .maxlen = sizeof(int), | 124 | .maxlen = sizeof(int), |
125 | .mode = 0644, | 125 | .mode = 0644, |
126 | .proc_handler = &proc_dointvec_minmax, | 126 | .proc_handler = proc_dointvec_minmax, |
127 | .extra1 = &xfs_params.inherit_noatim.min, | 127 | .extra1 = &xfs_params.inherit_noatim.min, |
128 | .extra2 = &xfs_params.inherit_noatim.max | 128 | .extra2 = &xfs_params.inherit_noatim.max |
129 | }, | 129 | }, |
@@ -132,7 +132,7 @@ static ctl_table xfs_table[] = { | |||
132 | .data = &xfs_params.xfs_buf_timer.val, | 132 | .data = &xfs_params.xfs_buf_timer.val, |
133 | .maxlen = sizeof(int), | 133 | .maxlen = sizeof(int), |
134 | .mode = 0644, | 134 | .mode = 0644, |
135 | .proc_handler = &proc_dointvec_minmax, | 135 | .proc_handler = proc_dointvec_minmax, |
136 | .extra1 = &xfs_params.xfs_buf_timer.min, | 136 | .extra1 = &xfs_params.xfs_buf_timer.min, |
137 | .extra2 = &xfs_params.xfs_buf_timer.max | 137 | .extra2 = &xfs_params.xfs_buf_timer.max |
138 | }, | 138 | }, |
@@ -141,7 +141,7 @@ static ctl_table xfs_table[] = { | |||
141 | .data = &xfs_params.xfs_buf_age.val, | 141 | .data = &xfs_params.xfs_buf_age.val, |
142 | .maxlen = sizeof(int), | 142 | .maxlen = sizeof(int), |
143 | .mode = 0644, | 143 | .mode = 0644, |
144 | .proc_handler = &proc_dointvec_minmax, | 144 | .proc_handler = proc_dointvec_minmax, |
145 | .extra1 = &xfs_params.xfs_buf_age.min, | 145 | .extra1 = &xfs_params.xfs_buf_age.min, |
146 | .extra2 = &xfs_params.xfs_buf_age.max | 146 | .extra2 = &xfs_params.xfs_buf_age.max |
147 | }, | 147 | }, |
@@ -150,7 +150,7 @@ static ctl_table xfs_table[] = { | |||
150 | .data = &xfs_params.inherit_nosym.val, | 150 | .data = &xfs_params.inherit_nosym.val, |
151 | .maxlen = sizeof(int), | 151 | .maxlen = sizeof(int), |
152 | .mode = 0644, | 152 | .mode = 0644, |
153 | .proc_handler = &proc_dointvec_minmax, | 153 | .proc_handler = proc_dointvec_minmax, |
154 | .extra1 = &xfs_params.inherit_nosym.min, | 154 | .extra1 = &xfs_params.inherit_nosym.min, |
155 | .extra2 = &xfs_params.inherit_nosym.max | 155 | .extra2 = &xfs_params.inherit_nosym.max |
156 | }, | 156 | }, |
@@ -159,7 +159,7 @@ static ctl_table xfs_table[] = { | |||
159 | .data = &xfs_params.rotorstep.val, | 159 | .data = &xfs_params.rotorstep.val, |
160 | .maxlen = sizeof(int), | 160 | .maxlen = sizeof(int), |
161 | .mode = 0644, | 161 | .mode = 0644, |
162 | .proc_handler = &proc_dointvec_minmax, | 162 | .proc_handler = proc_dointvec_minmax, |
163 | .extra1 = &xfs_params.rotorstep.min, | 163 | .extra1 = &xfs_params.rotorstep.min, |
164 | .extra2 = &xfs_params.rotorstep.max | 164 | .extra2 = &xfs_params.rotorstep.max |
165 | }, | 165 | }, |
@@ -168,7 +168,7 @@ static ctl_table xfs_table[] = { | |||
168 | .data = &xfs_params.inherit_nodfrg.val, | 168 | .data = &xfs_params.inherit_nodfrg.val, |
169 | .maxlen = sizeof(int), | 169 | .maxlen = sizeof(int), |
170 | .mode = 0644, | 170 | .mode = 0644, |
171 | .proc_handler = &proc_dointvec_minmax, | 171 | .proc_handler = proc_dointvec_minmax, |
172 | .extra1 = &xfs_params.inherit_nodfrg.min, | 172 | .extra1 = &xfs_params.inherit_nodfrg.min, |
173 | .extra2 = &xfs_params.inherit_nodfrg.max | 173 | .extra2 = &xfs_params.inherit_nodfrg.max |
174 | }, | 174 | }, |
@@ -177,7 +177,7 @@ static ctl_table xfs_table[] = { | |||
177 | .data = &xfs_params.fstrm_timer.val, | 177 | .data = &xfs_params.fstrm_timer.val, |
178 | .maxlen = sizeof(int), | 178 | .maxlen = sizeof(int), |
179 | .mode = 0644, | 179 | .mode = 0644, |
180 | .proc_handler = &proc_dointvec_minmax, | 180 | .proc_handler = proc_dointvec_minmax, |
181 | .extra1 = &xfs_params.fstrm_timer.min, | 181 | .extra1 = &xfs_params.fstrm_timer.min, |
182 | .extra2 = &xfs_params.fstrm_timer.max, | 182 | .extra2 = &xfs_params.fstrm_timer.max, |
183 | }, | 183 | }, |
@@ -188,7 +188,7 @@ static ctl_table xfs_table[] = { | |||
188 | .data = &xfs_params.stats_clear.val, | 188 | .data = &xfs_params.stats_clear.val, |
189 | .maxlen = sizeof(int), | 189 | .maxlen = sizeof(int), |
190 | .mode = 0644, | 190 | .mode = 0644, |
191 | .proc_handler = &xfs_stats_clear_proc_handler, | 191 | .proc_handler = xfs_stats_clear_proc_handler, |
192 | .extra1 = &xfs_params.stats_clear.min, | 192 | .extra1 = &xfs_params.stats_clear.min, |
193 | .extra2 = &xfs_params.stats_clear.max | 193 | .extra2 = &xfs_params.stats_clear.max |
194 | }, | 194 | }, |
diff --git a/kernel/slow-work.c b/kernel/slow-work.c index 0134b15b38d8..ebd9a8317a76 100644 --- a/kernel/slow-work.c +++ b/kernel/slow-work.c | |||
@@ -74,7 +74,7 @@ ctl_table slow_work_sysctls[] = { | |||
74 | .data = &vslow_work_proportion, | 74 | .data = &vslow_work_proportion, |
75 | .maxlen = sizeof(unsigned), | 75 | .maxlen = sizeof(unsigned), |
76 | .mode = 0644, | 76 | .mode = 0644, |
77 | .proc_handler = &proc_dointvec_minmax, | 77 | .proc_handler = proc_dointvec_minmax, |
78 | .extra1 = (void *) &slow_work_min_vslow, | 78 | .extra1 = (void *) &slow_work_min_vslow, |
79 | .extra2 = (void *) &slow_work_max_vslow, | 79 | .extra2 = (void *) &slow_work_max_vslow, |
80 | }, | 80 | }, |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index b4a5763d6dc8..e2ccc89382cb 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -249,7 +249,7 @@ static struct ctl_table kern_table[] = { | |||
249 | .data = &sysctl_sched_child_runs_first, | 249 | .data = &sysctl_sched_child_runs_first, |
250 | .maxlen = sizeof(unsigned int), | 250 | .maxlen = sizeof(unsigned int), |
251 | .mode = 0644, | 251 | .mode = 0644, |
252 | .proc_handler = &proc_dointvec, | 252 | .proc_handler = proc_dointvec, |
253 | }, | 253 | }, |
254 | #ifdef CONFIG_SCHED_DEBUG | 254 | #ifdef CONFIG_SCHED_DEBUG |
255 | { | 255 | { |
@@ -257,7 +257,7 @@ static struct ctl_table kern_table[] = { | |||
257 | .data = &sysctl_sched_min_granularity, | 257 | .data = &sysctl_sched_min_granularity, |
258 | .maxlen = sizeof(unsigned int), | 258 | .maxlen = sizeof(unsigned int), |
259 | .mode = 0644, | 259 | .mode = 0644, |
260 | .proc_handler = &sched_nr_latency_handler, | 260 | .proc_handler = sched_nr_latency_handler, |
261 | .extra1 = &min_sched_granularity_ns, | 261 | .extra1 = &min_sched_granularity_ns, |
262 | .extra2 = &max_sched_granularity_ns, | 262 | .extra2 = &max_sched_granularity_ns, |
263 | }, | 263 | }, |
@@ -266,7 +266,7 @@ static struct ctl_table kern_table[] = { | |||
266 | .data = &sysctl_sched_latency, | 266 | .data = &sysctl_sched_latency, |
267 | .maxlen = sizeof(unsigned int), | 267 | .maxlen = sizeof(unsigned int), |
268 | .mode = 0644, | 268 | .mode = 0644, |
269 | .proc_handler = &sched_nr_latency_handler, | 269 | .proc_handler = sched_nr_latency_handler, |
270 | .extra1 = &min_sched_granularity_ns, | 270 | .extra1 = &min_sched_granularity_ns, |
271 | .extra2 = &max_sched_granularity_ns, | 271 | .extra2 = &max_sched_granularity_ns, |
272 | }, | 272 | }, |
@@ -275,7 +275,7 @@ static struct ctl_table kern_table[] = { | |||
275 | .data = &sysctl_sched_wakeup_granularity, | 275 | .data = &sysctl_sched_wakeup_granularity, |
276 | .maxlen = sizeof(unsigned int), | 276 | .maxlen = sizeof(unsigned int), |
277 | .mode = 0644, | 277 | .mode = 0644, |
278 | .proc_handler = &proc_dointvec_minmax, | 278 | .proc_handler = proc_dointvec_minmax, |
279 | .extra1 = &min_wakeup_granularity_ns, | 279 | .extra1 = &min_wakeup_granularity_ns, |
280 | .extra2 = &max_wakeup_granularity_ns, | 280 | .extra2 = &max_wakeup_granularity_ns, |
281 | }, | 281 | }, |
@@ -284,14 +284,14 @@ static struct ctl_table kern_table[] = { | |||
284 | .data = &sysctl_sched_shares_ratelimit, | 284 | .data = &sysctl_sched_shares_ratelimit, |
285 | .maxlen = sizeof(unsigned int), | 285 | .maxlen = sizeof(unsigned int), |
286 | .mode = 0644, | 286 | .mode = 0644, |
287 | .proc_handler = &proc_dointvec, | 287 | .proc_handler = proc_dointvec, |
288 | }, | 288 | }, |
289 | { | 289 | { |
290 | .procname = "sched_shares_thresh", | 290 | .procname = "sched_shares_thresh", |
291 | .data = &sysctl_sched_shares_thresh, | 291 | .data = &sysctl_sched_shares_thresh, |
292 | .maxlen = sizeof(unsigned int), | 292 | .maxlen = sizeof(unsigned int), |
293 | .mode = 0644, | 293 | .mode = 0644, |
294 | .proc_handler = &proc_dointvec_minmax, | 294 | .proc_handler = proc_dointvec_minmax, |
295 | .extra1 = &zero, | 295 | .extra1 = &zero, |
296 | }, | 296 | }, |
297 | { | 297 | { |
@@ -299,35 +299,35 @@ static struct ctl_table kern_table[] = { | |||
299 | .data = &sysctl_sched_features, | 299 | .data = &sysctl_sched_features, |
300 | .maxlen = sizeof(unsigned int), | 300 | .maxlen = sizeof(unsigned int), |
301 | .mode = 0644, | 301 | .mode = 0644, |
302 | .proc_handler = &proc_dointvec, | 302 | .proc_handler = proc_dointvec, |
303 | }, | 303 | }, |
304 | { | 304 | { |
305 | .procname = "sched_migration_cost", | 305 | .procname = "sched_migration_cost", |
306 | .data = &sysctl_sched_migration_cost, | 306 | .data = &sysctl_sched_migration_cost, |
307 | .maxlen = sizeof(unsigned int), | 307 | .maxlen = sizeof(unsigned int), |
308 | .mode = 0644, | 308 | .mode = 0644, |
309 | .proc_handler = &proc_dointvec, | 309 | .proc_handler = proc_dointvec, |
310 | }, | 310 | }, |
311 | { | 311 | { |
312 | .procname = "sched_nr_migrate", | 312 | .procname = "sched_nr_migrate", |
313 | .data = &sysctl_sched_nr_migrate, | 313 | .data = &sysctl_sched_nr_migrate, |
314 | .maxlen = sizeof(unsigned int), | 314 | .maxlen = sizeof(unsigned int), |
315 | .mode = 0644, | 315 | .mode = 0644, |
316 | .proc_handler = &proc_dointvec, | 316 | .proc_handler = proc_dointvec, |
317 | }, | 317 | }, |
318 | { | 318 | { |
319 | .procname = "sched_time_avg", | 319 | .procname = "sched_time_avg", |
320 | .data = &sysctl_sched_time_avg, | 320 | .data = &sysctl_sched_time_avg, |
321 | .maxlen = sizeof(unsigned int), | 321 | .maxlen = sizeof(unsigned int), |
322 | .mode = 0644, | 322 | .mode = 0644, |
323 | .proc_handler = &proc_dointvec, | 323 | .proc_handler = proc_dointvec, |
324 | }, | 324 | }, |
325 | { | 325 | { |
326 | .procname = "timer_migration", | 326 | .procname = "timer_migration", |
327 | .data = &sysctl_timer_migration, | 327 | .data = &sysctl_timer_migration, |
328 | .maxlen = sizeof(unsigned int), | 328 | .maxlen = sizeof(unsigned int), |
329 | .mode = 0644, | 329 | .mode = 0644, |
330 | .proc_handler = &proc_dointvec_minmax, | 330 | .proc_handler = proc_dointvec_minmax, |
331 | .extra1 = &zero, | 331 | .extra1 = &zero, |
332 | .extra2 = &one, | 332 | .extra2 = &one, |
333 | }, | 333 | }, |
@@ -337,21 +337,21 @@ static struct ctl_table kern_table[] = { | |||
337 | .data = &sysctl_sched_rt_period, | 337 | .data = &sysctl_sched_rt_period, |
338 | .maxlen = sizeof(unsigned int), | 338 | .maxlen = sizeof(unsigned int), |
339 | .mode = 0644, | 339 | .mode = 0644, |
340 | .proc_handler = &sched_rt_handler, | 340 | .proc_handler = sched_rt_handler, |
341 | }, | 341 | }, |
342 | { | 342 | { |
343 | .procname = "sched_rt_runtime_us", | 343 | .procname = "sched_rt_runtime_us", |
344 | .data = &sysctl_sched_rt_runtime, | 344 | .data = &sysctl_sched_rt_runtime, |
345 | .maxlen = sizeof(int), | 345 | .maxlen = sizeof(int), |
346 | .mode = 0644, | 346 | .mode = 0644, |
347 | .proc_handler = &sched_rt_handler, | 347 | .proc_handler = sched_rt_handler, |
348 | }, | 348 | }, |
349 | { | 349 | { |
350 | .procname = "sched_compat_yield", | 350 | .procname = "sched_compat_yield", |
351 | .data = &sysctl_sched_compat_yield, | 351 | .data = &sysctl_sched_compat_yield, |
352 | .maxlen = sizeof(unsigned int), | 352 | .maxlen = sizeof(unsigned int), |
353 | .mode = 0644, | 353 | .mode = 0644, |
354 | .proc_handler = &proc_dointvec, | 354 | .proc_handler = proc_dointvec, |
355 | }, | 355 | }, |
356 | #ifdef CONFIG_PROVE_LOCKING | 356 | #ifdef CONFIG_PROVE_LOCKING |
357 | { | 357 | { |
@@ -359,7 +359,7 @@ static struct ctl_table kern_table[] = { | |||
359 | .data = &prove_locking, | 359 | .data = &prove_locking, |
360 | .maxlen = sizeof(int), | 360 | .maxlen = sizeof(int), |
361 | .mode = 0644, | 361 | .mode = 0644, |
362 | .proc_handler = &proc_dointvec, | 362 | .proc_handler = proc_dointvec, |
363 | }, | 363 | }, |
364 | #endif | 364 | #endif |
365 | #ifdef CONFIG_LOCK_STAT | 365 | #ifdef CONFIG_LOCK_STAT |
@@ -368,7 +368,7 @@ static struct ctl_table kern_table[] = { | |||
368 | .data = &lock_stat, | 368 | .data = &lock_stat, |
369 | .maxlen = sizeof(int), | 369 | .maxlen = sizeof(int), |
370 | .mode = 0644, | 370 | .mode = 0644, |
371 | .proc_handler = &proc_dointvec, | 371 | .proc_handler = proc_dointvec, |
372 | }, | 372 | }, |
373 | #endif | 373 | #endif |
374 | { | 374 | { |
@@ -376,35 +376,35 @@ static struct ctl_table kern_table[] = { | |||
376 | .data = &panic_timeout, | 376 | .data = &panic_timeout, |
377 | .maxlen = sizeof(int), | 377 | .maxlen = sizeof(int), |
378 | .mode = 0644, | 378 | .mode = 0644, |
379 | .proc_handler = &proc_dointvec, | 379 | .proc_handler = proc_dointvec, |
380 | }, | 380 | }, |
381 | { | 381 | { |
382 | .procname = "core_uses_pid", | 382 | .procname = "core_uses_pid", |
383 | .data = &core_uses_pid, | 383 | .data = &core_uses_pid, |
384 | .maxlen = sizeof(int), | 384 | .maxlen = sizeof(int), |
385 | .mode = 0644, | 385 | .mode = 0644, |
386 | .proc_handler = &proc_dointvec, | 386 | .proc_handler = proc_dointvec, |
387 | }, | 387 | }, |
388 | { | 388 | { |
389 | .procname = "core_pattern", | 389 | .procname = "core_pattern", |
390 | .data = core_pattern, | 390 | .data = core_pattern, |
391 | .maxlen = CORENAME_MAX_SIZE, | 391 | .maxlen = CORENAME_MAX_SIZE, |
392 | .mode = 0644, | 392 | .mode = 0644, |
393 | .proc_handler = &proc_dostring, | 393 | .proc_handler = proc_dostring, |
394 | }, | 394 | }, |
395 | { | 395 | { |
396 | .procname = "core_pipe_limit", | 396 | .procname = "core_pipe_limit", |
397 | .data = &core_pipe_limit, | 397 | .data = &core_pipe_limit, |
398 | .maxlen = sizeof(unsigned int), | 398 | .maxlen = sizeof(unsigned int), |
399 | .mode = 0644, | 399 | .mode = 0644, |
400 | .proc_handler = &proc_dointvec, | 400 | .proc_handler = proc_dointvec, |
401 | }, | 401 | }, |
402 | #ifdef CONFIG_PROC_SYSCTL | 402 | #ifdef CONFIG_PROC_SYSCTL |
403 | { | 403 | { |
404 | .procname = "tainted", | 404 | .procname = "tainted", |
405 | .maxlen = sizeof(long), | 405 | .maxlen = sizeof(long), |
406 | .mode = 0644, | 406 | .mode = 0644, |
407 | .proc_handler = &proc_taint, | 407 | .proc_handler = proc_taint, |
408 | }, | 408 | }, |
409 | #endif | 409 | #endif |
410 | #ifdef CONFIG_LATENCYTOP | 410 | #ifdef CONFIG_LATENCYTOP |
@@ -413,7 +413,7 @@ static struct ctl_table kern_table[] = { | |||
413 | .data = &latencytop_enabled, | 413 | .data = &latencytop_enabled, |
414 | .maxlen = sizeof(int), | 414 | .maxlen = sizeof(int), |
415 | .mode = 0644, | 415 | .mode = 0644, |
416 | .proc_handler = &proc_dointvec, | 416 | .proc_handler = proc_dointvec, |
417 | }, | 417 | }, |
418 | #endif | 418 | #endif |
419 | #ifdef CONFIG_BLK_DEV_INITRD | 419 | #ifdef CONFIG_BLK_DEV_INITRD |
@@ -422,7 +422,7 @@ static struct ctl_table kern_table[] = { | |||
422 | .data = &real_root_dev, | 422 | .data = &real_root_dev, |
423 | .maxlen = sizeof(int), | 423 | .maxlen = sizeof(int), |
424 | .mode = 0644, | 424 | .mode = 0644, |
425 | .proc_handler = &proc_dointvec, | 425 | .proc_handler = proc_dointvec, |
426 | }, | 426 | }, |
427 | #endif | 427 | #endif |
428 | { | 428 | { |
@@ -430,7 +430,7 @@ static struct ctl_table kern_table[] = { | |||
430 | .data = &print_fatal_signals, | 430 | .data = &print_fatal_signals, |
431 | .maxlen = sizeof(int), | 431 | .maxlen = sizeof(int), |
432 | .mode = 0644, | 432 | .mode = 0644, |
433 | .proc_handler = &proc_dointvec, | 433 | .proc_handler = proc_dointvec, |
434 | }, | 434 | }, |
435 | #ifdef CONFIG_SPARC | 435 | #ifdef CONFIG_SPARC |
436 | { | 436 | { |
@@ -438,21 +438,21 @@ static struct ctl_table kern_table[] = { | |||
438 | .data = reboot_command, | 438 | .data = reboot_command, |
439 | .maxlen = 256, | 439 | .maxlen = 256, |
440 | .mode = 0644, | 440 | .mode = 0644, |
441 | .proc_handler = &proc_dostring, | 441 | .proc_handler = proc_dostring, |
442 | }, | 442 | }, |
443 | { | 443 | { |
444 | .procname = "stop-a", | 444 | .procname = "stop-a", |
445 | .data = &stop_a_enabled, | 445 | .data = &stop_a_enabled, |
446 | .maxlen = sizeof (int), | 446 | .maxlen = sizeof (int), |
447 | .mode = 0644, | 447 | .mode = 0644, |
448 | .proc_handler = &proc_dointvec, | 448 | .proc_handler = proc_dointvec, |
449 | }, | 449 | }, |
450 | { | 450 | { |
451 | .procname = "scons-poweroff", | 451 | .procname = "scons-poweroff", |
452 | .data = &scons_pwroff, | 452 | .data = &scons_pwroff, |
453 | .maxlen = sizeof (int), | 453 | .maxlen = sizeof (int), |
454 | .mode = 0644, | 454 | .mode = 0644, |
455 | .proc_handler = &proc_dointvec, | 455 | .proc_handler = proc_dointvec, |
456 | }, | 456 | }, |
457 | #endif | 457 | #endif |
458 | #ifdef CONFIG_SPARC64 | 458 | #ifdef CONFIG_SPARC64 |
@@ -461,7 +461,7 @@ static struct ctl_table kern_table[] = { | |||
461 | .data = &sysctl_tsb_ratio, | 461 | .data = &sysctl_tsb_ratio, |
462 | .maxlen = sizeof (int), | 462 | .maxlen = sizeof (int), |
463 | .mode = 0644, | 463 | .mode = 0644, |
464 | .proc_handler = &proc_dointvec, | 464 | .proc_handler = proc_dointvec, |
465 | }, | 465 | }, |
466 | #endif | 466 | #endif |
467 | #ifdef __hppa__ | 467 | #ifdef __hppa__ |
@@ -470,14 +470,14 @@ static struct ctl_table kern_table[] = { | |||
470 | .data = &pwrsw_enabled, | 470 | .data = &pwrsw_enabled, |
471 | .maxlen = sizeof (int), | 471 | .maxlen = sizeof (int), |
472 | .mode = 0644, | 472 | .mode = 0644, |
473 | .proc_handler = &proc_dointvec, | 473 | .proc_handler = proc_dointvec, |
474 | }, | 474 | }, |
475 | { | 475 | { |
476 | .procname = "unaligned-trap", | 476 | .procname = "unaligned-trap", |
477 | .data = &unaligned_enabled, | 477 | .data = &unaligned_enabled, |
478 | .maxlen = sizeof (int), | 478 | .maxlen = sizeof (int), |
479 | .mode = 0644, | 479 | .mode = 0644, |
480 | .proc_handler = &proc_dointvec, | 480 | .proc_handler = proc_dointvec, |
481 | }, | 481 | }, |
482 | #endif | 482 | #endif |
483 | { | 483 | { |
@@ -485,7 +485,7 @@ static struct ctl_table kern_table[] = { | |||
485 | .data = &C_A_D, | 485 | .data = &C_A_D, |
486 | .maxlen = sizeof(int), | 486 | .maxlen = sizeof(int), |
487 | .mode = 0644, | 487 | .mode = 0644, |
488 | .proc_handler = &proc_dointvec, | 488 | .proc_handler = proc_dointvec, |
489 | }, | 489 | }, |
490 | #ifdef CONFIG_FUNCTION_TRACER | 490 | #ifdef CONFIG_FUNCTION_TRACER |
491 | { | 491 | { |
@@ -493,7 +493,7 @@ static struct ctl_table kern_table[] = { | |||
493 | .data = &ftrace_enabled, | 493 | .data = &ftrace_enabled, |
494 | .maxlen = sizeof(int), | 494 | .maxlen = sizeof(int), |
495 | .mode = 0644, | 495 | .mode = 0644, |
496 | .proc_handler = &ftrace_enable_sysctl, | 496 | .proc_handler = ftrace_enable_sysctl, |
497 | }, | 497 | }, |
498 | #endif | 498 | #endif |
499 | #ifdef CONFIG_STACK_TRACER | 499 | #ifdef CONFIG_STACK_TRACER |
@@ -502,7 +502,7 @@ static struct ctl_table kern_table[] = { | |||
502 | .data = &stack_tracer_enabled, | 502 | .data = &stack_tracer_enabled, |
503 | .maxlen = sizeof(int), | 503 | .maxlen = sizeof(int), |
504 | .mode = 0644, | 504 | .mode = 0644, |
505 | .proc_handler = &stack_trace_sysctl, | 505 | .proc_handler = stack_trace_sysctl, |
506 | }, | 506 | }, |
507 | #endif | 507 | #endif |
508 | #ifdef CONFIG_TRACING | 508 | #ifdef CONFIG_TRACING |
@@ -511,7 +511,7 @@ static struct ctl_table kern_table[] = { | |||
511 | .data = &ftrace_dump_on_oops, | 511 | .data = &ftrace_dump_on_oops, |
512 | .maxlen = sizeof(int), | 512 | .maxlen = sizeof(int), |
513 | .mode = 0644, | 513 | .mode = 0644, |
514 | .proc_handler = &proc_dointvec, | 514 | .proc_handler = proc_dointvec, |
515 | }, | 515 | }, |
516 | #endif | 516 | #endif |
517 | #ifdef CONFIG_MODULES | 517 | #ifdef CONFIG_MODULES |
@@ -520,7 +520,7 @@ static struct ctl_table kern_table[] = { | |||
520 | .data = &modprobe_path, | 520 | .data = &modprobe_path, |
521 | .maxlen = KMOD_PATH_LEN, | 521 | .maxlen = KMOD_PATH_LEN, |
522 | .mode = 0644, | 522 | .mode = 0644, |
523 | .proc_handler = &proc_dostring, | 523 | .proc_handler = proc_dostring, |
524 | }, | 524 | }, |
525 | { | 525 | { |
526 | .procname = "modules_disabled", | 526 | .procname = "modules_disabled", |
@@ -528,7 +528,7 @@ static struct ctl_table kern_table[] = { | |||
528 | .maxlen = sizeof(int), | 528 | .maxlen = sizeof(int), |
529 | .mode = 0644, | 529 | .mode = 0644, |
530 | /* only handle a transition from default "0" to "1" */ | 530 | /* only handle a transition from default "0" to "1" */ |
531 | .proc_handler = &proc_dointvec_minmax, | 531 | .proc_handler = proc_dointvec_minmax, |
532 | .extra1 = &one, | 532 | .extra1 = &one, |
533 | .extra2 = &one, | 533 | .extra2 = &one, |
534 | }, | 534 | }, |
@@ -539,7 +539,7 @@ static struct ctl_table kern_table[] = { | |||
539 | .data = &uevent_helper, | 539 | .data = &uevent_helper, |
540 | .maxlen = UEVENT_HELPER_PATH_LEN, | 540 | .maxlen = UEVENT_HELPER_PATH_LEN, |
541 | .mode = 0644, | 541 | .mode = 0644, |
542 | .proc_handler = &proc_dostring, | 542 | .proc_handler = proc_dostring, |
543 | }, | 543 | }, |
544 | #endif | 544 | #endif |
545 | #ifdef CONFIG_CHR_DEV_SG | 545 | #ifdef CONFIG_CHR_DEV_SG |
@@ -548,7 +548,7 @@ static struct ctl_table kern_table[] = { | |||
548 | .data = &sg_big_buff, | 548 | .data = &sg_big_buff, |
549 | .maxlen = sizeof (int), | 549 | .maxlen = sizeof (int), |
550 | .mode = 0444, | 550 | .mode = 0444, |
551 | .proc_handler = &proc_dointvec, | 551 | .proc_handler = proc_dointvec, |
552 | }, | 552 | }, |
553 | #endif | 553 | #endif |
554 | #ifdef CONFIG_BSD_PROCESS_ACCT | 554 | #ifdef CONFIG_BSD_PROCESS_ACCT |
@@ -557,7 +557,7 @@ static struct ctl_table kern_table[] = { | |||
557 | .data = &acct_parm, | 557 | .data = &acct_parm, |
558 | .maxlen = 3*sizeof(int), | 558 | .maxlen = 3*sizeof(int), |
559 | .mode = 0644, | 559 | .mode = 0644, |
560 | .proc_handler = &proc_dointvec, | 560 | .proc_handler = proc_dointvec, |
561 | }, | 561 | }, |
562 | #endif | 562 | #endif |
563 | #ifdef CONFIG_MAGIC_SYSRQ | 563 | #ifdef CONFIG_MAGIC_SYSRQ |
@@ -566,7 +566,7 @@ static struct ctl_table kern_table[] = { | |||
566 | .data = &__sysrq_enabled, | 566 | .data = &__sysrq_enabled, |
567 | .maxlen = sizeof (int), | 567 | .maxlen = sizeof (int), |
568 | .mode = 0644, | 568 | .mode = 0644, |
569 | .proc_handler = &proc_dointvec, | 569 | .proc_handler = proc_dointvec, |
570 | }, | 570 | }, |
571 | #endif | 571 | #endif |
572 | #ifdef CONFIG_PROC_SYSCTL | 572 | #ifdef CONFIG_PROC_SYSCTL |
@@ -575,7 +575,7 @@ static struct ctl_table kern_table[] = { | |||
575 | .data = NULL, | 575 | .data = NULL, |
576 | .maxlen = sizeof (int), | 576 | .maxlen = sizeof (int), |
577 | .mode = 0600, | 577 | .mode = 0600, |
578 | .proc_handler = &proc_do_cad_pid, | 578 | .proc_handler = proc_do_cad_pid, |
579 | }, | 579 | }, |
580 | #endif | 580 | #endif |
581 | { | 581 | { |
@@ -583,7 +583,7 @@ static struct ctl_table kern_table[] = { | |||
583 | .data = &max_threads, | 583 | .data = &max_threads, |
584 | .maxlen = sizeof(int), | 584 | .maxlen = sizeof(int), |
585 | .mode = 0644, | 585 | .mode = 0644, |
586 | .proc_handler = &proc_dointvec, | 586 | .proc_handler = proc_dointvec, |
587 | }, | 587 | }, |
588 | { | 588 | { |
589 | .procname = "random", | 589 | .procname = "random", |
@@ -595,7 +595,7 @@ static struct ctl_table kern_table[] = { | |||
595 | .data = &overflowuid, | 595 | .data = &overflowuid, |
596 | .maxlen = sizeof(int), | 596 | .maxlen = sizeof(int), |
597 | .mode = 0644, | 597 | .mode = 0644, |
598 | .proc_handler = &proc_dointvec_minmax, | 598 | .proc_handler = proc_dointvec_minmax, |
599 | .extra1 = &minolduid, | 599 | .extra1 = &minolduid, |
600 | .extra2 = &maxolduid, | 600 | .extra2 = &maxolduid, |
601 | }, | 601 | }, |
@@ -604,7 +604,7 @@ static struct ctl_table kern_table[] = { | |||
604 | .data = &overflowgid, | 604 | .data = &overflowgid, |
605 | .maxlen = sizeof(int), | 605 | .maxlen = sizeof(int), |
606 | .mode = 0644, | 606 | .mode = 0644, |
607 | .proc_handler = &proc_dointvec_minmax, | 607 | .proc_handler = proc_dointvec_minmax, |
608 | .extra1 = &minolduid, | 608 | .extra1 = &minolduid, |
609 | .extra2 = &maxolduid, | 609 | .extra2 = &maxolduid, |
610 | }, | 610 | }, |
@@ -615,7 +615,7 @@ static struct ctl_table kern_table[] = { | |||
615 | .data = &sysctl_ieee_emulation_warnings, | 615 | .data = &sysctl_ieee_emulation_warnings, |
616 | .maxlen = sizeof(int), | 616 | .maxlen = sizeof(int), |
617 | .mode = 0644, | 617 | .mode = 0644, |
618 | .proc_handler = &proc_dointvec, | 618 | .proc_handler = proc_dointvec, |
619 | }, | 619 | }, |
620 | #endif | 620 | #endif |
621 | { | 621 | { |
@@ -623,7 +623,7 @@ static struct ctl_table kern_table[] = { | |||
623 | .data = &sysctl_userprocess_debug, | 623 | .data = &sysctl_userprocess_debug, |
624 | .maxlen = sizeof(int), | 624 | .maxlen = sizeof(int), |
625 | .mode = 0644, | 625 | .mode = 0644, |
626 | .proc_handler = &proc_dointvec, | 626 | .proc_handler = proc_dointvec, |
627 | }, | 627 | }, |
628 | #endif | 628 | #endif |
629 | { | 629 | { |
@@ -631,7 +631,7 @@ static struct ctl_table kern_table[] = { | |||
631 | .data = &pid_max, | 631 | .data = &pid_max, |
632 | .maxlen = sizeof (int), | 632 | .maxlen = sizeof (int), |
633 | .mode = 0644, | 633 | .mode = 0644, |
634 | .proc_handler = &proc_dointvec_minmax, | 634 | .proc_handler = proc_dointvec_minmax, |
635 | .extra1 = &pid_max_min, | 635 | .extra1 = &pid_max_min, |
636 | .extra2 = &pid_max_max, | 636 | .extra2 = &pid_max_max, |
637 | }, | 637 | }, |
@@ -640,7 +640,7 @@ static struct ctl_table kern_table[] = { | |||
640 | .data = &panic_on_oops, | 640 | .data = &panic_on_oops, |
641 | .maxlen = sizeof(int), | 641 | .maxlen = sizeof(int), |
642 | .mode = 0644, | 642 | .mode = 0644, |
643 | .proc_handler = &proc_dointvec, | 643 | .proc_handler = proc_dointvec, |
644 | }, | 644 | }, |
645 | #if defined CONFIG_PRINTK | 645 | #if defined CONFIG_PRINTK |
646 | { | 646 | { |
@@ -648,28 +648,28 @@ static struct ctl_table kern_table[] = { | |||
648 | .data = &console_loglevel, | 648 | .data = &console_loglevel, |
649 | .maxlen = 4*sizeof(int), | 649 | .maxlen = 4*sizeof(int), |
650 | .mode = 0644, | 650 | .mode = 0644, |
651 | .proc_handler = &proc_dointvec, | 651 | .proc_handler = proc_dointvec, |
652 | }, | 652 | }, |
653 | { | 653 | { |
654 | .procname = "printk_ratelimit", | 654 | .procname = "printk_ratelimit", |
655 | .data = &printk_ratelimit_state.interval, | 655 | .data = &printk_ratelimit_state.interval, |
656 | .maxlen = sizeof(int), | 656 | .maxlen = sizeof(int), |
657 | .mode = 0644, | 657 | .mode = 0644, |
658 | .proc_handler = &proc_dointvec_jiffies, | 658 | .proc_handler = proc_dointvec_jiffies, |
659 | }, | 659 | }, |
660 | { | 660 | { |
661 | .procname = "printk_ratelimit_burst", | 661 | .procname = "printk_ratelimit_burst", |
662 | .data = &printk_ratelimit_state.burst, | 662 | .data = &printk_ratelimit_state.burst, |
663 | .maxlen = sizeof(int), | 663 | .maxlen = sizeof(int), |
664 | .mode = 0644, | 664 | .mode = 0644, |
665 | .proc_handler = &proc_dointvec, | 665 | .proc_handler = proc_dointvec, |
666 | }, | 666 | }, |
667 | { | 667 | { |
668 | .procname = "printk_delay", | 668 | .procname = "printk_delay", |
669 | .data = &printk_delay_msec, | 669 | .data = &printk_delay_msec, |
670 | .maxlen = sizeof(int), | 670 | .maxlen = sizeof(int), |
671 | .mode = 0644, | 671 | .mode = 0644, |
672 | .proc_handler = &proc_dointvec_minmax, | 672 | .proc_handler = proc_dointvec_minmax, |
673 | .extra1 = &zero, | 673 | .extra1 = &zero, |
674 | .extra2 = &ten_thousand, | 674 | .extra2 = &ten_thousand, |
675 | }, | 675 | }, |
@@ -679,7 +679,7 @@ static struct ctl_table kern_table[] = { | |||
679 | .data = &ngroups_max, | 679 | .data = &ngroups_max, |
680 | .maxlen = sizeof (int), | 680 | .maxlen = sizeof (int), |
681 | .mode = 0444, | 681 | .mode = 0444, |
682 | .proc_handler = &proc_dointvec, | 682 | .proc_handler = proc_dointvec, |
683 | }, | 683 | }, |
684 | #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) | 684 | #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) |
685 | { | 685 | { |
@@ -687,14 +687,14 @@ static struct ctl_table kern_table[] = { | |||
687 | .data = &unknown_nmi_panic, | 687 | .data = &unknown_nmi_panic, |
688 | .maxlen = sizeof (int), | 688 | .maxlen = sizeof (int), |
689 | .mode = 0644, | 689 | .mode = 0644, |
690 | .proc_handler = &proc_dointvec, | 690 | .proc_handler = proc_dointvec, |
691 | }, | 691 | }, |
692 | { | 692 | { |
693 | .procname = "nmi_watchdog", | 693 | .procname = "nmi_watchdog", |
694 | .data = &nmi_watchdog_enabled, | 694 | .data = &nmi_watchdog_enabled, |
695 | .maxlen = sizeof (int), | 695 | .maxlen = sizeof (int), |
696 | .mode = 0644, | 696 | .mode = 0644, |
697 | .proc_handler = &proc_nmi_enabled, | 697 | .proc_handler = proc_nmi_enabled, |
698 | }, | 698 | }, |
699 | #endif | 699 | #endif |
700 | #if defined(CONFIG_X86) | 700 | #if defined(CONFIG_X86) |
@@ -703,42 +703,42 @@ static struct ctl_table kern_table[] = { | |||
703 | .data = &panic_on_unrecovered_nmi, | 703 | .data = &panic_on_unrecovered_nmi, |
704 | .maxlen = sizeof(int), | 704 | .maxlen = sizeof(int), |
705 | .mode = 0644, | 705 | .mode = 0644, |
706 | .proc_handler = &proc_dointvec, | 706 | .proc_handler = proc_dointvec, |
707 | }, | 707 | }, |
708 | { | 708 | { |
709 | .procname = "panic_on_io_nmi", | 709 | .procname = "panic_on_io_nmi", |
710 | .data = &panic_on_io_nmi, | 710 | .data = &panic_on_io_nmi, |
711 | .maxlen = sizeof(int), | 711 | .maxlen = sizeof(int), |
712 | .mode = 0644, | 712 | .mode = 0644, |
713 | .proc_handler = &proc_dointvec, | 713 | .proc_handler = proc_dointvec, |
714 | }, | 714 | }, |
715 | { | 715 | { |
716 | .procname = "bootloader_type", | 716 | .procname = "bootloader_type", |
717 | .data = &bootloader_type, | 717 | .data = &bootloader_type, |
718 | .maxlen = sizeof (int), | 718 | .maxlen = sizeof (int), |
719 | .mode = 0444, | 719 | .mode = 0444, |
720 | .proc_handler = &proc_dointvec, | 720 | .proc_handler = proc_dointvec, |
721 | }, | 721 | }, |
722 | { | 722 | { |
723 | .procname = "bootloader_version", | 723 | .procname = "bootloader_version", |
724 | .data = &bootloader_version, | 724 | .data = &bootloader_version, |
725 | .maxlen = sizeof (int), | 725 | .maxlen = sizeof (int), |
726 | .mode = 0444, | 726 | .mode = 0444, |
727 | .proc_handler = &proc_dointvec, | 727 | .proc_handler = proc_dointvec, |
728 | }, | 728 | }, |
729 | { | 729 | { |
730 | .procname = "kstack_depth_to_print", | 730 | .procname = "kstack_depth_to_print", |
731 | .data = &kstack_depth_to_print, | 731 | .data = &kstack_depth_to_print, |
732 | .maxlen = sizeof(int), | 732 | .maxlen = sizeof(int), |
733 | .mode = 0644, | 733 | .mode = 0644, |
734 | .proc_handler = &proc_dointvec, | 734 | .proc_handler = proc_dointvec, |
735 | }, | 735 | }, |
736 | { | 736 | { |
737 | .procname = "io_delay_type", | 737 | .procname = "io_delay_type", |
738 | .data = &io_delay_type, | 738 | .data = &io_delay_type, |
739 | .maxlen = sizeof(int), | 739 | .maxlen = sizeof(int), |
740 | .mode = 0644, | 740 | .mode = 0644, |
741 | .proc_handler = &proc_dointvec, | 741 | .proc_handler = proc_dointvec, |
742 | }, | 742 | }, |
743 | #endif | 743 | #endif |
744 | #if defined(CONFIG_MMU) | 744 | #if defined(CONFIG_MMU) |
@@ -747,7 +747,7 @@ static struct ctl_table kern_table[] = { | |||
747 | .data = &randomize_va_space, | 747 | .data = &randomize_va_space, |
748 | .maxlen = sizeof(int), | 748 | .maxlen = sizeof(int), |
749 | .mode = 0644, | 749 | .mode = 0644, |
750 | .proc_handler = &proc_dointvec, | 750 | .proc_handler = proc_dointvec, |
751 | }, | 751 | }, |
752 | #endif | 752 | #endif |
753 | #if defined(CONFIG_S390) && defined(CONFIG_SMP) | 753 | #if defined(CONFIG_S390) && defined(CONFIG_SMP) |
@@ -756,7 +756,7 @@ static struct ctl_table kern_table[] = { | |||
756 | .data = &spin_retry, | 756 | .data = &spin_retry, |
757 | .maxlen = sizeof (int), | 757 | .maxlen = sizeof (int), |
758 | .mode = 0644, | 758 | .mode = 0644, |
759 | .proc_handler = &proc_dointvec, | 759 | .proc_handler = proc_dointvec, |
760 | }, | 760 | }, |
761 | #endif | 761 | #endif |
762 | #if defined(CONFIG_ACPI_SLEEP) && defined(CONFIG_X86) | 762 | #if defined(CONFIG_ACPI_SLEEP) && defined(CONFIG_X86) |
@@ -765,7 +765,7 @@ static struct ctl_table kern_table[] = { | |||
765 | .data = &acpi_realmode_flags, | 765 | .data = &acpi_realmode_flags, |
766 | .maxlen = sizeof (unsigned long), | 766 | .maxlen = sizeof (unsigned long), |
767 | .mode = 0644, | 767 | .mode = 0644, |
768 | .proc_handler = &proc_doulongvec_minmax, | 768 | .proc_handler = proc_doulongvec_minmax, |
769 | }, | 769 | }, |
770 | #endif | 770 | #endif |
771 | #ifdef CONFIG_IA64 | 771 | #ifdef CONFIG_IA64 |
@@ -774,14 +774,14 @@ static struct ctl_table kern_table[] = { | |||
774 | .data = &no_unaligned_warning, | 774 | .data = &no_unaligned_warning, |
775 | .maxlen = sizeof (int), | 775 | .maxlen = sizeof (int), |
776 | .mode = 0644, | 776 | .mode = 0644, |
777 | .proc_handler = &proc_dointvec, | 777 | .proc_handler = proc_dointvec, |
778 | }, | 778 | }, |
779 | { | 779 | { |
780 | .procname = "unaligned-dump-stack", | 780 | .procname = "unaligned-dump-stack", |
781 | .data = &unaligned_dump_stack, | 781 | .data = &unaligned_dump_stack, |
782 | .maxlen = sizeof (int), | 782 | .maxlen = sizeof (int), |
783 | .mode = 0644, | 783 | .mode = 0644, |
784 | .proc_handler = &proc_dointvec, | 784 | .proc_handler = proc_dointvec, |
785 | }, | 785 | }, |
786 | #endif | 786 | #endif |
787 | #ifdef CONFIG_DETECT_SOFTLOCKUP | 787 | #ifdef CONFIG_DETECT_SOFTLOCKUP |
@@ -790,7 +790,7 @@ static struct ctl_table kern_table[] = { | |||
790 | .data = &softlockup_panic, | 790 | .data = &softlockup_panic, |
791 | .maxlen = sizeof(int), | 791 | .maxlen = sizeof(int), |
792 | .mode = 0644, | 792 | .mode = 0644, |
793 | .proc_handler = &proc_dointvec_minmax, | 793 | .proc_handler = proc_dointvec_minmax, |
794 | .extra1 = &zero, | 794 | .extra1 = &zero, |
795 | .extra2 = &one, | 795 | .extra2 = &one, |
796 | }, | 796 | }, |
@@ -799,7 +799,7 @@ static struct ctl_table kern_table[] = { | |||
799 | .data = &softlockup_thresh, | 799 | .data = &softlockup_thresh, |
800 | .maxlen = sizeof(int), | 800 | .maxlen = sizeof(int), |
801 | .mode = 0644, | 801 | .mode = 0644, |
802 | .proc_handler = &proc_dosoftlockup_thresh, | 802 | .proc_handler = proc_dosoftlockup_thresh, |
803 | .extra1 = &neg_one, | 803 | .extra1 = &neg_one, |
804 | .extra2 = &sixty, | 804 | .extra2 = &sixty, |
805 | }, | 805 | }, |
@@ -810,7 +810,7 @@ static struct ctl_table kern_table[] = { | |||
810 | .data = &sysctl_hung_task_panic, | 810 | .data = &sysctl_hung_task_panic, |
811 | .maxlen = sizeof(int), | 811 | .maxlen = sizeof(int), |
812 | .mode = 0644, | 812 | .mode = 0644, |
813 | .proc_handler = &proc_dointvec_minmax, | 813 | .proc_handler = proc_dointvec_minmax, |
814 | .extra1 = &zero, | 814 | .extra1 = &zero, |
815 | .extra2 = &one, | 815 | .extra2 = &one, |
816 | }, | 816 | }, |
@@ -819,21 +819,21 @@ static struct ctl_table kern_table[] = { | |||
819 | .data = &sysctl_hung_task_check_count, | 819 | .data = &sysctl_hung_task_check_count, |
820 | .maxlen = sizeof(unsigned long), | 820 | .maxlen = sizeof(unsigned long), |
821 | .mode = 0644, | 821 | .mode = 0644, |
822 | .proc_handler = &proc_doulongvec_minmax, | 822 | .proc_handler = proc_doulongvec_minmax, |
823 | }, | 823 | }, |
824 | { | 824 | { |
825 | .procname = "hung_task_timeout_secs", | 825 | .procname = "hung_task_timeout_secs", |
826 | .data = &sysctl_hung_task_timeout_secs, | 826 | .data = &sysctl_hung_task_timeout_secs, |
827 | .maxlen = sizeof(unsigned long), | 827 | .maxlen = sizeof(unsigned long), |
828 | .mode = 0644, | 828 | .mode = 0644, |
829 | .proc_handler = &proc_dohung_task_timeout_secs, | 829 | .proc_handler = proc_dohung_task_timeout_secs, |
830 | }, | 830 | }, |
831 | { | 831 | { |
832 | .procname = "hung_task_warnings", | 832 | .procname = "hung_task_warnings", |
833 | .data = &sysctl_hung_task_warnings, | 833 | .data = &sysctl_hung_task_warnings, |
834 | .maxlen = sizeof(unsigned long), | 834 | .maxlen = sizeof(unsigned long), |
835 | .mode = 0644, | 835 | .mode = 0644, |
836 | .proc_handler = &proc_doulongvec_minmax, | 836 | .proc_handler = proc_doulongvec_minmax, |
837 | }, | 837 | }, |
838 | #endif | 838 | #endif |
839 | #ifdef CONFIG_COMPAT | 839 | #ifdef CONFIG_COMPAT |
@@ -842,7 +842,7 @@ static struct ctl_table kern_table[] = { | |||
842 | .data = &compat_log, | 842 | .data = &compat_log, |
843 | .maxlen = sizeof (int), | 843 | .maxlen = sizeof (int), |
844 | .mode = 0644, | 844 | .mode = 0644, |
845 | .proc_handler = &proc_dointvec, | 845 | .proc_handler = proc_dointvec, |
846 | }, | 846 | }, |
847 | #endif | 847 | #endif |
848 | #ifdef CONFIG_RT_MUTEXES | 848 | #ifdef CONFIG_RT_MUTEXES |
@@ -851,7 +851,7 @@ static struct ctl_table kern_table[] = { | |||
851 | .data = &max_lock_depth, | 851 | .data = &max_lock_depth, |
852 | .maxlen = sizeof(int), | 852 | .maxlen = sizeof(int), |
853 | .mode = 0644, | 853 | .mode = 0644, |
854 | .proc_handler = &proc_dointvec, | 854 | .proc_handler = proc_dointvec, |
855 | }, | 855 | }, |
856 | #endif | 856 | #endif |
857 | { | 857 | { |
@@ -859,7 +859,7 @@ static struct ctl_table kern_table[] = { | |||
859 | .data = &poweroff_cmd, | 859 | .data = &poweroff_cmd, |
860 | .maxlen = POWEROFF_CMD_PATH_LEN, | 860 | .maxlen = POWEROFF_CMD_PATH_LEN, |
861 | .mode = 0644, | 861 | .mode = 0644, |
862 | .proc_handler = &proc_dostring, | 862 | .proc_handler = proc_dostring, |
863 | }, | 863 | }, |
864 | #ifdef CONFIG_KEYS | 864 | #ifdef CONFIG_KEYS |
865 | { | 865 | { |
@@ -874,7 +874,7 @@ static struct ctl_table kern_table[] = { | |||
874 | .data = &rcutorture_runnable, | 874 | .data = &rcutorture_runnable, |
875 | .maxlen = sizeof(int), | 875 | .maxlen = sizeof(int), |
876 | .mode = 0644, | 876 | .mode = 0644, |
877 | .proc_handler = &proc_dointvec, | 877 | .proc_handler = proc_dointvec, |
878 | }, | 878 | }, |
879 | #endif | 879 | #endif |
880 | #ifdef CONFIG_SLOW_WORK | 880 | #ifdef CONFIG_SLOW_WORK |
@@ -890,21 +890,21 @@ static struct ctl_table kern_table[] = { | |||
890 | .data = &sysctl_perf_event_paranoid, | 890 | .data = &sysctl_perf_event_paranoid, |
891 | .maxlen = sizeof(sysctl_perf_event_paranoid), | 891 | .maxlen = sizeof(sysctl_perf_event_paranoid), |
892 | .mode = 0644, | 892 | .mode = 0644, |
893 | .proc_handler = &proc_dointvec, | 893 | .proc_handler = proc_dointvec, |
894 | }, | 894 | }, |
895 | { | 895 | { |
896 | .procname = "perf_event_mlock_kb", | 896 | .procname = "perf_event_mlock_kb", |
897 | .data = &sysctl_perf_event_mlock, | 897 | .data = &sysctl_perf_event_mlock, |
898 | .maxlen = sizeof(sysctl_perf_event_mlock), | 898 | .maxlen = sizeof(sysctl_perf_event_mlock), |
899 | .mode = 0644, | 899 | .mode = 0644, |
900 | .proc_handler = &proc_dointvec, | 900 | .proc_handler = proc_dointvec, |
901 | }, | 901 | }, |
902 | { | 902 | { |
903 | .procname = "perf_event_max_sample_rate", | 903 | .procname = "perf_event_max_sample_rate", |
904 | .data = &sysctl_perf_event_sample_rate, | 904 | .data = &sysctl_perf_event_sample_rate, |
905 | .maxlen = sizeof(sysctl_perf_event_sample_rate), | 905 | .maxlen = sizeof(sysctl_perf_event_sample_rate), |
906 | .mode = 0644, | 906 | .mode = 0644, |
907 | .proc_handler = &proc_dointvec, | 907 | .proc_handler = proc_dointvec, |
908 | }, | 908 | }, |
909 | #endif | 909 | #endif |
910 | #ifdef CONFIG_KMEMCHECK | 910 | #ifdef CONFIG_KMEMCHECK |
@@ -913,7 +913,7 @@ static struct ctl_table kern_table[] = { | |||
913 | .data = &kmemcheck_enabled, | 913 | .data = &kmemcheck_enabled, |
914 | .maxlen = sizeof(int), | 914 | .maxlen = sizeof(int), |
915 | .mode = 0644, | 915 | .mode = 0644, |
916 | .proc_handler = &proc_dointvec, | 916 | .proc_handler = proc_dointvec, |
917 | }, | 917 | }, |
918 | #endif | 918 | #endif |
919 | #ifdef CONFIG_BLOCK | 919 | #ifdef CONFIG_BLOCK |
@@ -922,7 +922,7 @@ static struct ctl_table kern_table[] = { | |||
922 | .data = &blk_iopoll_enabled, | 922 | .data = &blk_iopoll_enabled, |
923 | .maxlen = sizeof(int), | 923 | .maxlen = sizeof(int), |
924 | .mode = 0644, | 924 | .mode = 0644, |
925 | .proc_handler = &proc_dointvec, | 925 | .proc_handler = proc_dointvec, |
926 | }, | 926 | }, |
927 | #endif | 927 | #endif |
928 | /* | 928 | /* |
@@ -938,49 +938,49 @@ static struct ctl_table vm_table[] = { | |||
938 | .data = &sysctl_overcommit_memory, | 938 | .data = &sysctl_overcommit_memory, |
939 | .maxlen = sizeof(sysctl_overcommit_memory), | 939 | .maxlen = sizeof(sysctl_overcommit_memory), |
940 | .mode = 0644, | 940 | .mode = 0644, |
941 | .proc_handler = &proc_dointvec, | 941 | .proc_handler = proc_dointvec, |
942 | }, | 942 | }, |
943 | { | 943 | { |
944 | .procname = "panic_on_oom", | 944 | .procname = "panic_on_oom", |
945 | .data = &sysctl_panic_on_oom, | 945 | .data = &sysctl_panic_on_oom, |
946 | .maxlen = sizeof(sysctl_panic_on_oom), | 946 | .maxlen = sizeof(sysctl_panic_on_oom), |
947 | .mode = 0644, | 947 | .mode = 0644, |
948 | .proc_handler = &proc_dointvec, | 948 | .proc_handler = proc_dointvec, |
949 | }, | 949 | }, |
950 | { | 950 | { |
951 | .procname = "oom_kill_allocating_task", | 951 | .procname = "oom_kill_allocating_task", |
952 | .data = &sysctl_oom_kill_allocating_task, | 952 | .data = &sysctl_oom_kill_allocating_task, |
953 | .maxlen = sizeof(sysctl_oom_kill_allocating_task), | 953 | .maxlen = sizeof(sysctl_oom_kill_allocating_task), |
954 | .mode = 0644, | 954 | .mode = 0644, |
955 | .proc_handler = &proc_dointvec, | 955 | .proc_handler = proc_dointvec, |
956 | }, | 956 | }, |
957 | { | 957 | { |
958 | .procname = "oom_dump_tasks", | 958 | .procname = "oom_dump_tasks", |
959 | .data = &sysctl_oom_dump_tasks, | 959 | .data = &sysctl_oom_dump_tasks, |
960 | .maxlen = sizeof(sysctl_oom_dump_tasks), | 960 | .maxlen = sizeof(sysctl_oom_dump_tasks), |
961 | .mode = 0644, | 961 | .mode = 0644, |
962 | .proc_handler = &proc_dointvec, | 962 | .proc_handler = proc_dointvec, |
963 | }, | 963 | }, |
964 | { | 964 | { |
965 | .procname = "overcommit_ratio", | 965 | .procname = "overcommit_ratio", |
966 | .data = &sysctl_overcommit_ratio, | 966 | .data = &sysctl_overcommit_ratio, |
967 | .maxlen = sizeof(sysctl_overcommit_ratio), | 967 | .maxlen = sizeof(sysctl_overcommit_ratio), |
968 | .mode = 0644, | 968 | .mode = 0644, |
969 | .proc_handler = &proc_dointvec, | 969 | .proc_handler = proc_dointvec, |
970 | }, | 970 | }, |
971 | { | 971 | { |
972 | .procname = "page-cluster", | 972 | .procname = "page-cluster", |
973 | .data = &page_cluster, | 973 | .data = &page_cluster, |
974 | .maxlen = sizeof(int), | 974 | .maxlen = sizeof(int), |
975 | .mode = 0644, | 975 | .mode = 0644, |
976 | .proc_handler = &proc_dointvec, | 976 | .proc_handler = proc_dointvec, |
977 | }, | 977 | }, |
978 | { | 978 | { |
979 | .procname = "dirty_background_ratio", | 979 | .procname = "dirty_background_ratio", |
980 | .data = &dirty_background_ratio, | 980 | .data = &dirty_background_ratio, |
981 | .maxlen = sizeof(dirty_background_ratio), | 981 | .maxlen = sizeof(dirty_background_ratio), |
982 | .mode = 0644, | 982 | .mode = 0644, |
983 | .proc_handler = &dirty_background_ratio_handler, | 983 | .proc_handler = dirty_background_ratio_handler, |
984 | .extra1 = &zero, | 984 | .extra1 = &zero, |
985 | .extra2 = &one_hundred, | 985 | .extra2 = &one_hundred, |
986 | }, | 986 | }, |
@@ -989,7 +989,7 @@ static struct ctl_table vm_table[] = { | |||
989 | .data = &dirty_background_bytes, | 989 | .data = &dirty_background_bytes, |
990 | .maxlen = sizeof(dirty_background_bytes), | 990 | .maxlen = sizeof(dirty_background_bytes), |
991 | .mode = 0644, | 991 | .mode = 0644, |
992 | .proc_handler = &dirty_background_bytes_handler, | 992 | .proc_handler = dirty_background_bytes_handler, |
993 | .extra1 = &one_ul, | 993 | .extra1 = &one_ul, |
994 | }, | 994 | }, |
995 | { | 995 | { |
@@ -997,7 +997,7 @@ static struct ctl_table vm_table[] = { | |||
997 | .data = &vm_dirty_ratio, | 997 | .data = &vm_dirty_ratio, |
998 | .maxlen = sizeof(vm_dirty_ratio), | 998 | .maxlen = sizeof(vm_dirty_ratio), |
999 | .mode = 0644, | 999 | .mode = 0644, |
1000 | .proc_handler = &dirty_ratio_handler, | 1000 | .proc_handler = dirty_ratio_handler, |
1001 | .extra1 = &zero, | 1001 | .extra1 = &zero, |
1002 | .extra2 = &one_hundred, | 1002 | .extra2 = &one_hundred, |
1003 | }, | 1003 | }, |
@@ -1006,7 +1006,7 @@ static struct ctl_table vm_table[] = { | |||
1006 | .data = &vm_dirty_bytes, | 1006 | .data = &vm_dirty_bytes, |
1007 | .maxlen = sizeof(vm_dirty_bytes), | 1007 | .maxlen = sizeof(vm_dirty_bytes), |
1008 | .mode = 0644, | 1008 | .mode = 0644, |
1009 | .proc_handler = &dirty_bytes_handler, | 1009 | .proc_handler = dirty_bytes_handler, |
1010 | .extra1 = &dirty_bytes_min, | 1010 | .extra1 = &dirty_bytes_min, |
1011 | }, | 1011 | }, |
1012 | { | 1012 | { |
@@ -1014,28 +1014,28 @@ static struct ctl_table vm_table[] = { | |||
1014 | .data = &dirty_writeback_interval, | 1014 | .data = &dirty_writeback_interval, |
1015 | .maxlen = sizeof(dirty_writeback_interval), | 1015 | .maxlen = sizeof(dirty_writeback_interval), |
1016 | .mode = 0644, | 1016 | .mode = 0644, |
1017 | .proc_handler = &dirty_writeback_centisecs_handler, | 1017 | .proc_handler = dirty_writeback_centisecs_handler, |
1018 | }, | 1018 | }, |
1019 | { | 1019 | { |
1020 | .procname = "dirty_expire_centisecs", | 1020 | .procname = "dirty_expire_centisecs", |
1021 | .data = &dirty_expire_interval, | 1021 | .data = &dirty_expire_interval, |
1022 | .maxlen = sizeof(dirty_expire_interval), | 1022 | .maxlen = sizeof(dirty_expire_interval), |
1023 | .mode = 0644, | 1023 | .mode = 0644, |
1024 | .proc_handler = &proc_dointvec, | 1024 | .proc_handler = proc_dointvec, |
1025 | }, | 1025 | }, |
1026 | { | 1026 | { |
1027 | .procname = "nr_pdflush_threads", | 1027 | .procname = "nr_pdflush_threads", |
1028 | .data = &nr_pdflush_threads, | 1028 | .data = &nr_pdflush_threads, |
1029 | .maxlen = sizeof nr_pdflush_threads, | 1029 | .maxlen = sizeof nr_pdflush_threads, |
1030 | .mode = 0444 /* read-only*/, | 1030 | .mode = 0444 /* read-only*/, |
1031 | .proc_handler = &proc_dointvec, | 1031 | .proc_handler = proc_dointvec, |
1032 | }, | 1032 | }, |
1033 | { | 1033 | { |
1034 | .procname = "swappiness", | 1034 | .procname = "swappiness", |
1035 | .data = &vm_swappiness, | 1035 | .data = &vm_swappiness, |
1036 | .maxlen = sizeof(vm_swappiness), | 1036 | .maxlen = sizeof(vm_swappiness), |
1037 | .mode = 0644, | 1037 | .mode = 0644, |
1038 | .proc_handler = &proc_dointvec_minmax, | 1038 | .proc_handler = proc_dointvec_minmax, |
1039 | .extra1 = &zero, | 1039 | .extra1 = &zero, |
1040 | .extra2 = &one_hundred, | 1040 | .extra2 = &one_hundred, |
1041 | }, | 1041 | }, |
@@ -1045,7 +1045,7 @@ static struct ctl_table vm_table[] = { | |||
1045 | .data = NULL, | 1045 | .data = NULL, |
1046 | .maxlen = sizeof(unsigned long), | 1046 | .maxlen = sizeof(unsigned long), |
1047 | .mode = 0644, | 1047 | .mode = 0644, |
1048 | .proc_handler = &hugetlb_sysctl_handler, | 1048 | .proc_handler = hugetlb_sysctl_handler, |
1049 | .extra1 = (void *)&hugetlb_zero, | 1049 | .extra1 = (void *)&hugetlb_zero, |
1050 | .extra2 = (void *)&hugetlb_infinity, | 1050 | .extra2 = (void *)&hugetlb_infinity, |
1051 | }, | 1051 | }, |
@@ -1054,21 +1054,21 @@ static struct ctl_table vm_table[] = { | |||
1054 | .data = &sysctl_hugetlb_shm_group, | 1054 | .data = &sysctl_hugetlb_shm_group, |
1055 | .maxlen = sizeof(gid_t), | 1055 | .maxlen = sizeof(gid_t), |
1056 | .mode = 0644, | 1056 | .mode = 0644, |
1057 | .proc_handler = &proc_dointvec, | 1057 | .proc_handler = proc_dointvec, |
1058 | }, | 1058 | }, |
1059 | { | 1059 | { |
1060 | .procname = "hugepages_treat_as_movable", | 1060 | .procname = "hugepages_treat_as_movable", |
1061 | .data = &hugepages_treat_as_movable, | 1061 | .data = &hugepages_treat_as_movable, |
1062 | .maxlen = sizeof(int), | 1062 | .maxlen = sizeof(int), |
1063 | .mode = 0644, | 1063 | .mode = 0644, |
1064 | .proc_handler = &hugetlb_treat_movable_handler, | 1064 | .proc_handler = hugetlb_treat_movable_handler, |
1065 | }, | 1065 | }, |
1066 | { | 1066 | { |
1067 | .procname = "nr_overcommit_hugepages", | 1067 | .procname = "nr_overcommit_hugepages", |
1068 | .data = NULL, | 1068 | .data = NULL, |
1069 | .maxlen = sizeof(unsigned long), | 1069 | .maxlen = sizeof(unsigned long), |
1070 | .mode = 0644, | 1070 | .mode = 0644, |
1071 | .proc_handler = &hugetlb_overcommit_handler, | 1071 | .proc_handler = hugetlb_overcommit_handler, |
1072 | .extra1 = (void *)&hugetlb_zero, | 1072 | .extra1 = (void *)&hugetlb_zero, |
1073 | .extra2 = (void *)&hugetlb_infinity, | 1073 | .extra2 = (void *)&hugetlb_infinity, |
1074 | }, | 1074 | }, |
@@ -1078,7 +1078,7 @@ static struct ctl_table vm_table[] = { | |||
1078 | .data = &sysctl_lowmem_reserve_ratio, | 1078 | .data = &sysctl_lowmem_reserve_ratio, |
1079 | .maxlen = sizeof(sysctl_lowmem_reserve_ratio), | 1079 | .maxlen = sizeof(sysctl_lowmem_reserve_ratio), |
1080 | .mode = 0644, | 1080 | .mode = 0644, |
1081 | .proc_handler = &lowmem_reserve_ratio_sysctl_handler, | 1081 | .proc_handler = lowmem_reserve_ratio_sysctl_handler, |
1082 | }, | 1082 | }, |
1083 | { | 1083 | { |
1084 | .procname = "drop_caches", | 1084 | .procname = "drop_caches", |
@@ -1092,7 +1092,7 @@ static struct ctl_table vm_table[] = { | |||
1092 | .data = &min_free_kbytes, | 1092 | .data = &min_free_kbytes, |
1093 | .maxlen = sizeof(min_free_kbytes), | 1093 | .maxlen = sizeof(min_free_kbytes), |
1094 | .mode = 0644, | 1094 | .mode = 0644, |
1095 | .proc_handler = &min_free_kbytes_sysctl_handler, | 1095 | .proc_handler = min_free_kbytes_sysctl_handler, |
1096 | .extra1 = &zero, | 1096 | .extra1 = &zero, |
1097 | }, | 1097 | }, |
1098 | { | 1098 | { |
@@ -1100,7 +1100,7 @@ static struct ctl_table vm_table[] = { | |||
1100 | .data = &percpu_pagelist_fraction, | 1100 | .data = &percpu_pagelist_fraction, |
1101 | .maxlen = sizeof(percpu_pagelist_fraction), | 1101 | .maxlen = sizeof(percpu_pagelist_fraction), |
1102 | .mode = 0644, | 1102 | .mode = 0644, |
1103 | .proc_handler = &percpu_pagelist_fraction_sysctl_handler, | 1103 | .proc_handler = percpu_pagelist_fraction_sysctl_handler, |
1104 | .extra1 = &min_percpu_pagelist_fract, | 1104 | .extra1 = &min_percpu_pagelist_fract, |
1105 | }, | 1105 | }, |
1106 | #ifdef CONFIG_MMU | 1106 | #ifdef CONFIG_MMU |
@@ -1109,7 +1109,7 @@ static struct ctl_table vm_table[] = { | |||
1109 | .data = &sysctl_max_map_count, | 1109 | .data = &sysctl_max_map_count, |
1110 | .maxlen = sizeof(sysctl_max_map_count), | 1110 | .maxlen = sizeof(sysctl_max_map_count), |
1111 | .mode = 0644, | 1111 | .mode = 0644, |
1112 | .proc_handler = &proc_dointvec | 1112 | .proc_handler = proc_dointvec |
1113 | }, | 1113 | }, |
1114 | #else | 1114 | #else |
1115 | { | 1115 | { |
@@ -1117,7 +1117,7 @@ static struct ctl_table vm_table[] = { | |||
1117 | .data = &sysctl_nr_trim_pages, | 1117 | .data = &sysctl_nr_trim_pages, |
1118 | .maxlen = sizeof(sysctl_nr_trim_pages), | 1118 | .maxlen = sizeof(sysctl_nr_trim_pages), |
1119 | .mode = 0644, | 1119 | .mode = 0644, |
1120 | .proc_handler = &proc_dointvec_minmax, | 1120 | .proc_handler = proc_dointvec_minmax, |
1121 | .extra1 = &zero, | 1121 | .extra1 = &zero, |
1122 | }, | 1122 | }, |
1123 | #endif | 1123 | #endif |
@@ -1126,14 +1126,14 @@ static struct ctl_table vm_table[] = { | |||
1126 | .data = &laptop_mode, | 1126 | .data = &laptop_mode, |
1127 | .maxlen = sizeof(laptop_mode), | 1127 | .maxlen = sizeof(laptop_mode), |
1128 | .mode = 0644, | 1128 | .mode = 0644, |
1129 | .proc_handler = &proc_dointvec_jiffies, | 1129 | .proc_handler = proc_dointvec_jiffies, |
1130 | }, | 1130 | }, |
1131 | { | 1131 | { |
1132 | .procname = "block_dump", | 1132 | .procname = "block_dump", |
1133 | .data = &block_dump, | 1133 | .data = &block_dump, |
1134 | .maxlen = sizeof(block_dump), | 1134 | .maxlen = sizeof(block_dump), |
1135 | .mode = 0644, | 1135 | .mode = 0644, |
1136 | .proc_handler = &proc_dointvec, | 1136 | .proc_handler = proc_dointvec, |
1137 | .extra1 = &zero, | 1137 | .extra1 = &zero, |
1138 | }, | 1138 | }, |
1139 | { | 1139 | { |
@@ -1141,7 +1141,7 @@ static struct ctl_table vm_table[] = { | |||
1141 | .data = &sysctl_vfs_cache_pressure, | 1141 | .data = &sysctl_vfs_cache_pressure, |
1142 | .maxlen = sizeof(sysctl_vfs_cache_pressure), | 1142 | .maxlen = sizeof(sysctl_vfs_cache_pressure), |
1143 | .mode = 0644, | 1143 | .mode = 0644, |
1144 | .proc_handler = &proc_dointvec, | 1144 | .proc_handler = proc_dointvec, |
1145 | .extra1 = &zero, | 1145 | .extra1 = &zero, |
1146 | }, | 1146 | }, |
1147 | #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT | 1147 | #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT |
@@ -1150,7 +1150,7 @@ static struct ctl_table vm_table[] = { | |||
1150 | .data = &sysctl_legacy_va_layout, | 1150 | .data = &sysctl_legacy_va_layout, |
1151 | .maxlen = sizeof(sysctl_legacy_va_layout), | 1151 | .maxlen = sizeof(sysctl_legacy_va_layout), |
1152 | .mode = 0644, | 1152 | .mode = 0644, |
1153 | .proc_handler = &proc_dointvec, | 1153 | .proc_handler = proc_dointvec, |
1154 | .extra1 = &zero, | 1154 | .extra1 = &zero, |
1155 | }, | 1155 | }, |
1156 | #endif | 1156 | #endif |
@@ -1160,7 +1160,7 @@ static struct ctl_table vm_table[] = { | |||
1160 | .data = &zone_reclaim_mode, | 1160 | .data = &zone_reclaim_mode, |
1161 | .maxlen = sizeof(zone_reclaim_mode), | 1161 | .maxlen = sizeof(zone_reclaim_mode), |
1162 | .mode = 0644, | 1162 | .mode = 0644, |
1163 | .proc_handler = &proc_dointvec, | 1163 | .proc_handler = proc_dointvec, |
1164 | .extra1 = &zero, | 1164 | .extra1 = &zero, |
1165 | }, | 1165 | }, |
1166 | { | 1166 | { |
@@ -1168,7 +1168,7 @@ static struct ctl_table vm_table[] = { | |||
1168 | .data = &sysctl_min_unmapped_ratio, | 1168 | .data = &sysctl_min_unmapped_ratio, |
1169 | .maxlen = sizeof(sysctl_min_unmapped_ratio), | 1169 | .maxlen = sizeof(sysctl_min_unmapped_ratio), |
1170 | .mode = 0644, | 1170 | .mode = 0644, |
1171 | .proc_handler = &sysctl_min_unmapped_ratio_sysctl_handler, | 1171 | .proc_handler = sysctl_min_unmapped_ratio_sysctl_handler, |
1172 | .extra1 = &zero, | 1172 | .extra1 = &zero, |
1173 | .extra2 = &one_hundred, | 1173 | .extra2 = &one_hundred, |
1174 | }, | 1174 | }, |
@@ -1177,7 +1177,7 @@ static struct ctl_table vm_table[] = { | |||
1177 | .data = &sysctl_min_slab_ratio, | 1177 | .data = &sysctl_min_slab_ratio, |
1178 | .maxlen = sizeof(sysctl_min_slab_ratio), | 1178 | .maxlen = sizeof(sysctl_min_slab_ratio), |
1179 | .mode = 0644, | 1179 | .mode = 0644, |
1180 | .proc_handler = &sysctl_min_slab_ratio_sysctl_handler, | 1180 | .proc_handler = sysctl_min_slab_ratio_sysctl_handler, |
1181 | .extra1 = &zero, | 1181 | .extra1 = &zero, |
1182 | .extra2 = &one_hundred, | 1182 | .extra2 = &one_hundred, |
1183 | }, | 1183 | }, |
@@ -1188,7 +1188,7 @@ static struct ctl_table vm_table[] = { | |||
1188 | .data = &sysctl_stat_interval, | 1188 | .data = &sysctl_stat_interval, |
1189 | .maxlen = sizeof(sysctl_stat_interval), | 1189 | .maxlen = sizeof(sysctl_stat_interval), |
1190 | .mode = 0644, | 1190 | .mode = 0644, |
1191 | .proc_handler = &proc_dointvec_jiffies, | 1191 | .proc_handler = proc_dointvec_jiffies, |
1192 | }, | 1192 | }, |
1193 | #endif | 1193 | #endif |
1194 | { | 1194 | { |
@@ -1196,7 +1196,7 @@ static struct ctl_table vm_table[] = { | |||
1196 | .data = &dac_mmap_min_addr, | 1196 | .data = &dac_mmap_min_addr, |
1197 | .maxlen = sizeof(unsigned long), | 1197 | .maxlen = sizeof(unsigned long), |
1198 | .mode = 0644, | 1198 | .mode = 0644, |
1199 | .proc_handler = &mmap_min_addr_handler, | 1199 | .proc_handler = mmap_min_addr_handler, |
1200 | }, | 1200 | }, |
1201 | #ifdef CONFIG_NUMA | 1201 | #ifdef CONFIG_NUMA |
1202 | { | 1202 | { |
@@ -1204,7 +1204,7 @@ static struct ctl_table vm_table[] = { | |||
1204 | .data = &numa_zonelist_order, | 1204 | .data = &numa_zonelist_order, |
1205 | .maxlen = NUMA_ZONELIST_ORDER_LEN, | 1205 | .maxlen = NUMA_ZONELIST_ORDER_LEN, |
1206 | .mode = 0644, | 1206 | .mode = 0644, |
1207 | .proc_handler = &numa_zonelist_order_handler, | 1207 | .proc_handler = numa_zonelist_order_handler, |
1208 | }, | 1208 | }, |
1209 | #endif | 1209 | #endif |
1210 | #if (defined(CONFIG_X86_32) && !defined(CONFIG_UML))|| \ | 1210 | #if (defined(CONFIG_X86_32) && !defined(CONFIG_UML))|| \ |
@@ -1214,7 +1214,7 @@ static struct ctl_table vm_table[] = { | |||
1214 | .data = &vdso_enabled, | 1214 | .data = &vdso_enabled, |
1215 | .maxlen = sizeof(vdso_enabled), | 1215 | .maxlen = sizeof(vdso_enabled), |
1216 | .mode = 0644, | 1216 | .mode = 0644, |
1217 | .proc_handler = &proc_dointvec, | 1217 | .proc_handler = proc_dointvec, |
1218 | .extra1 = &zero, | 1218 | .extra1 = &zero, |
1219 | }, | 1219 | }, |
1220 | #endif | 1220 | #endif |
@@ -1224,7 +1224,7 @@ static struct ctl_table vm_table[] = { | |||
1224 | .data = &vm_highmem_is_dirtyable, | 1224 | .data = &vm_highmem_is_dirtyable, |
1225 | .maxlen = sizeof(vm_highmem_is_dirtyable), | 1225 | .maxlen = sizeof(vm_highmem_is_dirtyable), |
1226 | .mode = 0644, | 1226 | .mode = 0644, |
1227 | .proc_handler = &proc_dointvec_minmax, | 1227 | .proc_handler = proc_dointvec_minmax, |
1228 | .extra1 = &zero, | 1228 | .extra1 = &zero, |
1229 | .extra2 = &one, | 1229 | .extra2 = &one, |
1230 | }, | 1230 | }, |
@@ -1234,7 +1234,7 @@ static struct ctl_table vm_table[] = { | |||
1234 | .data = &scan_unevictable_pages, | 1234 | .data = &scan_unevictable_pages, |
1235 | .maxlen = sizeof(scan_unevictable_pages), | 1235 | .maxlen = sizeof(scan_unevictable_pages), |
1236 | .mode = 0644, | 1236 | .mode = 0644, |
1237 | .proc_handler = &scan_unevictable_handler, | 1237 | .proc_handler = scan_unevictable_handler, |
1238 | }, | 1238 | }, |
1239 | #ifdef CONFIG_MEMORY_FAILURE | 1239 | #ifdef CONFIG_MEMORY_FAILURE |
1240 | { | 1240 | { |
@@ -1242,7 +1242,7 @@ static struct ctl_table vm_table[] = { | |||
1242 | .data = &sysctl_memory_failure_early_kill, | 1242 | .data = &sysctl_memory_failure_early_kill, |
1243 | .maxlen = sizeof(sysctl_memory_failure_early_kill), | 1243 | .maxlen = sizeof(sysctl_memory_failure_early_kill), |
1244 | .mode = 0644, | 1244 | .mode = 0644, |
1245 | .proc_handler = &proc_dointvec_minmax, | 1245 | .proc_handler = proc_dointvec_minmax, |
1246 | .extra1 = &zero, | 1246 | .extra1 = &zero, |
1247 | .extra2 = &one, | 1247 | .extra2 = &one, |
1248 | }, | 1248 | }, |
@@ -1251,7 +1251,7 @@ static struct ctl_table vm_table[] = { | |||
1251 | .data = &sysctl_memory_failure_recovery, | 1251 | .data = &sysctl_memory_failure_recovery, |
1252 | .maxlen = sizeof(sysctl_memory_failure_recovery), | 1252 | .maxlen = sizeof(sysctl_memory_failure_recovery), |
1253 | .mode = 0644, | 1253 | .mode = 0644, |
1254 | .proc_handler = &proc_dointvec_minmax, | 1254 | .proc_handler = proc_dointvec_minmax, |
1255 | .extra1 = &zero, | 1255 | .extra1 = &zero, |
1256 | .extra2 = &one, | 1256 | .extra2 = &one, |
1257 | }, | 1257 | }, |
@@ -1276,35 +1276,35 @@ static struct ctl_table fs_table[] = { | |||
1276 | .data = &inodes_stat, | 1276 | .data = &inodes_stat, |
1277 | .maxlen = 2*sizeof(int), | 1277 | .maxlen = 2*sizeof(int), |
1278 | .mode = 0444, | 1278 | .mode = 0444, |
1279 | .proc_handler = &proc_dointvec, | 1279 | .proc_handler = proc_dointvec, |
1280 | }, | 1280 | }, |
1281 | { | 1281 | { |
1282 | .procname = "inode-state", | 1282 | .procname = "inode-state", |
1283 | .data = &inodes_stat, | 1283 | .data = &inodes_stat, |
1284 | .maxlen = 7*sizeof(int), | 1284 | .maxlen = 7*sizeof(int), |
1285 | .mode = 0444, | 1285 | .mode = 0444, |
1286 | .proc_handler = &proc_dointvec, | 1286 | .proc_handler = proc_dointvec, |
1287 | }, | 1287 | }, |
1288 | { | 1288 | { |
1289 | .procname = "file-nr", | 1289 | .procname = "file-nr", |
1290 | .data = &files_stat, | 1290 | .data = &files_stat, |
1291 | .maxlen = 3*sizeof(int), | 1291 | .maxlen = 3*sizeof(int), |
1292 | .mode = 0444, | 1292 | .mode = 0444, |
1293 | .proc_handler = &proc_nr_files, | 1293 | .proc_handler = proc_nr_files, |
1294 | }, | 1294 | }, |
1295 | { | 1295 | { |
1296 | .procname = "file-max", | 1296 | .procname = "file-max", |
1297 | .data = &files_stat.max_files, | 1297 | .data = &files_stat.max_files, |
1298 | .maxlen = sizeof(int), | 1298 | .maxlen = sizeof(int), |
1299 | .mode = 0644, | 1299 | .mode = 0644, |
1300 | .proc_handler = &proc_dointvec, | 1300 | .proc_handler = proc_dointvec, |
1301 | }, | 1301 | }, |
1302 | { | 1302 | { |
1303 | .procname = "nr_open", | 1303 | .procname = "nr_open", |
1304 | .data = &sysctl_nr_open, | 1304 | .data = &sysctl_nr_open, |
1305 | .maxlen = sizeof(int), | 1305 | .maxlen = sizeof(int), |
1306 | .mode = 0644, | 1306 | .mode = 0644, |
1307 | .proc_handler = &proc_dointvec_minmax, | 1307 | .proc_handler = proc_dointvec_minmax, |
1308 | .extra1 = &sysctl_nr_open_min, | 1308 | .extra1 = &sysctl_nr_open_min, |
1309 | .extra2 = &sysctl_nr_open_max, | 1309 | .extra2 = &sysctl_nr_open_max, |
1310 | }, | 1310 | }, |
@@ -1313,14 +1313,14 @@ static struct ctl_table fs_table[] = { | |||
1313 | .data = &dentry_stat, | 1313 | .data = &dentry_stat, |
1314 | .maxlen = 6*sizeof(int), | 1314 | .maxlen = 6*sizeof(int), |
1315 | .mode = 0444, | 1315 | .mode = 0444, |
1316 | .proc_handler = &proc_dointvec, | 1316 | .proc_handler = proc_dointvec, |
1317 | }, | 1317 | }, |
1318 | { | 1318 | { |
1319 | .procname = "overflowuid", | 1319 | .procname = "overflowuid", |
1320 | .data = &fs_overflowuid, | 1320 | .data = &fs_overflowuid, |
1321 | .maxlen = sizeof(int), | 1321 | .maxlen = sizeof(int), |
1322 | .mode = 0644, | 1322 | .mode = 0644, |
1323 | .proc_handler = &proc_dointvec_minmax, | 1323 | .proc_handler = proc_dointvec_minmax, |
1324 | .extra1 = &minolduid, | 1324 | .extra1 = &minolduid, |
1325 | .extra2 = &maxolduid, | 1325 | .extra2 = &maxolduid, |
1326 | }, | 1326 | }, |
@@ -1329,7 +1329,7 @@ static struct ctl_table fs_table[] = { | |||
1329 | .data = &fs_overflowgid, | 1329 | .data = &fs_overflowgid, |
1330 | .maxlen = sizeof(int), | 1330 | .maxlen = sizeof(int), |
1331 | .mode = 0644, | 1331 | .mode = 0644, |
1332 | .proc_handler = &proc_dointvec_minmax, | 1332 | .proc_handler = proc_dointvec_minmax, |
1333 | .extra1 = &minolduid, | 1333 | .extra1 = &minolduid, |
1334 | .extra2 = &maxolduid, | 1334 | .extra2 = &maxolduid, |
1335 | }, | 1335 | }, |
@@ -1339,7 +1339,7 @@ static struct ctl_table fs_table[] = { | |||
1339 | .data = &leases_enable, | 1339 | .data = &leases_enable, |
1340 | .maxlen = sizeof(int), | 1340 | .maxlen = sizeof(int), |
1341 | .mode = 0644, | 1341 | .mode = 0644, |
1342 | .proc_handler = &proc_dointvec, | 1342 | .proc_handler = proc_dointvec, |
1343 | }, | 1343 | }, |
1344 | #endif | 1344 | #endif |
1345 | #ifdef CONFIG_DNOTIFY | 1345 | #ifdef CONFIG_DNOTIFY |
@@ -1348,7 +1348,7 @@ static struct ctl_table fs_table[] = { | |||
1348 | .data = &dir_notify_enable, | 1348 | .data = &dir_notify_enable, |
1349 | .maxlen = sizeof(int), | 1349 | .maxlen = sizeof(int), |
1350 | .mode = 0644, | 1350 | .mode = 0644, |
1351 | .proc_handler = &proc_dointvec, | 1351 | .proc_handler = proc_dointvec, |
1352 | }, | 1352 | }, |
1353 | #endif | 1353 | #endif |
1354 | #ifdef CONFIG_MMU | 1354 | #ifdef CONFIG_MMU |
@@ -1358,7 +1358,7 @@ static struct ctl_table fs_table[] = { | |||
1358 | .data = &lease_break_time, | 1358 | .data = &lease_break_time, |
1359 | .maxlen = sizeof(int), | 1359 | .maxlen = sizeof(int), |
1360 | .mode = 0644, | 1360 | .mode = 0644, |
1361 | .proc_handler = &proc_dointvec, | 1361 | .proc_handler = proc_dointvec, |
1362 | }, | 1362 | }, |
1363 | #endif | 1363 | #endif |
1364 | #ifdef CONFIG_AIO | 1364 | #ifdef CONFIG_AIO |
@@ -1367,14 +1367,14 @@ static struct ctl_table fs_table[] = { | |||
1367 | .data = &aio_nr, | 1367 | .data = &aio_nr, |
1368 | .maxlen = sizeof(aio_nr), | 1368 | .maxlen = sizeof(aio_nr), |
1369 | .mode = 0444, | 1369 | .mode = 0444, |
1370 | .proc_handler = &proc_doulongvec_minmax, | 1370 | .proc_handler = proc_doulongvec_minmax, |
1371 | }, | 1371 | }, |
1372 | { | 1372 | { |
1373 | .procname = "aio-max-nr", | 1373 | .procname = "aio-max-nr", |
1374 | .data = &aio_max_nr, | 1374 | .data = &aio_max_nr, |
1375 | .maxlen = sizeof(aio_max_nr), | 1375 | .maxlen = sizeof(aio_max_nr), |
1376 | .mode = 0644, | 1376 | .mode = 0644, |
1377 | .proc_handler = &proc_doulongvec_minmax, | 1377 | .proc_handler = proc_doulongvec_minmax, |
1378 | }, | 1378 | }, |
1379 | #endif /* CONFIG_AIO */ | 1379 | #endif /* CONFIG_AIO */ |
1380 | #ifdef CONFIG_INOTIFY_USER | 1380 | #ifdef CONFIG_INOTIFY_USER |
@@ -1397,7 +1397,7 @@ static struct ctl_table fs_table[] = { | |||
1397 | .data = &suid_dumpable, | 1397 | .data = &suid_dumpable, |
1398 | .maxlen = sizeof(int), | 1398 | .maxlen = sizeof(int), |
1399 | .mode = 0644, | 1399 | .mode = 0644, |
1400 | .proc_handler = &proc_dointvec_minmax, | 1400 | .proc_handler = proc_dointvec_minmax, |
1401 | .extra1 = &zero, | 1401 | .extra1 = &zero, |
1402 | .extra2 = &two, | 1402 | .extra2 = &two, |
1403 | }, | 1403 | }, |
diff --git a/net/rds/ib_sysctl.c b/net/rds/ib_sysctl.c index 517c6c9987ba..03f01cb4e0fe 100644 --- a/net/rds/ib_sysctl.c +++ b/net/rds/ib_sysctl.c | |||
@@ -71,7 +71,7 @@ ctl_table rds_ib_sysctl_table[] = { | |||
71 | .data = &rds_ib_sysctl_max_send_wr, | 71 | .data = &rds_ib_sysctl_max_send_wr, |
72 | .maxlen = sizeof(unsigned long), | 72 | .maxlen = sizeof(unsigned long), |
73 | .mode = 0644, | 73 | .mode = 0644, |
74 | .proc_handler = &proc_doulongvec_minmax, | 74 | .proc_handler = proc_doulongvec_minmax, |
75 | .extra1 = &rds_ib_sysctl_max_wr_min, | 75 | .extra1 = &rds_ib_sysctl_max_wr_min, |
76 | .extra2 = &rds_ib_sysctl_max_wr_max, | 76 | .extra2 = &rds_ib_sysctl_max_wr_max, |
77 | }, | 77 | }, |
@@ -80,7 +80,7 @@ ctl_table rds_ib_sysctl_table[] = { | |||
80 | .data = &rds_ib_sysctl_max_recv_wr, | 80 | .data = &rds_ib_sysctl_max_recv_wr, |
81 | .maxlen = sizeof(unsigned long), | 81 | .maxlen = sizeof(unsigned long), |
82 | .mode = 0644, | 82 | .mode = 0644, |
83 | .proc_handler = &proc_doulongvec_minmax, | 83 | .proc_handler = proc_doulongvec_minmax, |
84 | .extra1 = &rds_ib_sysctl_max_wr_min, | 84 | .extra1 = &rds_ib_sysctl_max_wr_min, |
85 | .extra2 = &rds_ib_sysctl_max_wr_max, | 85 | .extra2 = &rds_ib_sysctl_max_wr_max, |
86 | }, | 86 | }, |
@@ -89,7 +89,7 @@ ctl_table rds_ib_sysctl_table[] = { | |||
89 | .data = &rds_ib_sysctl_max_unsig_wrs, | 89 | .data = &rds_ib_sysctl_max_unsig_wrs, |
90 | .maxlen = sizeof(unsigned long), | 90 | .maxlen = sizeof(unsigned long), |
91 | .mode = 0644, | 91 | .mode = 0644, |
92 | .proc_handler = &proc_doulongvec_minmax, | 92 | .proc_handler = proc_doulongvec_minmax, |
93 | .extra1 = &rds_ib_sysctl_max_unsig_wr_min, | 93 | .extra1 = &rds_ib_sysctl_max_unsig_wr_min, |
94 | .extra2 = &rds_ib_sysctl_max_unsig_wr_max, | 94 | .extra2 = &rds_ib_sysctl_max_unsig_wr_max, |
95 | }, | 95 | }, |
@@ -98,7 +98,7 @@ ctl_table rds_ib_sysctl_table[] = { | |||
98 | .data = &rds_ib_sysctl_max_unsig_bytes, | 98 | .data = &rds_ib_sysctl_max_unsig_bytes, |
99 | .maxlen = sizeof(unsigned long), | 99 | .maxlen = sizeof(unsigned long), |
100 | .mode = 0644, | 100 | .mode = 0644, |
101 | .proc_handler = &proc_doulongvec_minmax, | 101 | .proc_handler = proc_doulongvec_minmax, |
102 | .extra1 = &rds_ib_sysctl_max_unsig_bytes_min, | 102 | .extra1 = &rds_ib_sysctl_max_unsig_bytes_min, |
103 | .extra2 = &rds_ib_sysctl_max_unsig_bytes_max, | 103 | .extra2 = &rds_ib_sysctl_max_unsig_bytes_max, |
104 | }, | 104 | }, |
@@ -107,14 +107,14 @@ ctl_table rds_ib_sysctl_table[] = { | |||
107 | .data = &rds_ib_sysctl_max_recv_allocation, | 107 | .data = &rds_ib_sysctl_max_recv_allocation, |
108 | .maxlen = sizeof(unsigned long), | 108 | .maxlen = sizeof(unsigned long), |
109 | .mode = 0644, | 109 | .mode = 0644, |
110 | .proc_handler = &proc_doulongvec_minmax, | 110 | .proc_handler = proc_doulongvec_minmax, |
111 | }, | 111 | }, |
112 | { | 112 | { |
113 | .procname = "flow_control", | 113 | .procname = "flow_control", |
114 | .data = &rds_ib_sysctl_flow_control, | 114 | .data = &rds_ib_sysctl_flow_control, |
115 | .maxlen = sizeof(rds_ib_sysctl_flow_control), | 115 | .maxlen = sizeof(rds_ib_sysctl_flow_control), |
116 | .mode = 0644, | 116 | .mode = 0644, |
117 | .proc_handler = &proc_dointvec, | 117 | .proc_handler = proc_dointvec, |
118 | }, | 118 | }, |
119 | { } | 119 | { } |
120 | }; | 120 | }; |
diff --git a/net/rds/iw_sysctl.c b/net/rds/iw_sysctl.c index 3e00b01559f2..1c4428a61a02 100644 --- a/net/rds/iw_sysctl.c +++ b/net/rds/iw_sysctl.c | |||
@@ -61,7 +61,7 @@ ctl_table rds_iw_sysctl_table[] = { | |||
61 | .data = &rds_iw_sysctl_max_send_wr, | 61 | .data = &rds_iw_sysctl_max_send_wr, |
62 | .maxlen = sizeof(unsigned long), | 62 | .maxlen = sizeof(unsigned long), |
63 | .mode = 0644, | 63 | .mode = 0644, |
64 | .proc_handler = &proc_doulongvec_minmax, | 64 | .proc_handler = proc_doulongvec_minmax, |
65 | .extra1 = &rds_iw_sysctl_max_wr_min, | 65 | .extra1 = &rds_iw_sysctl_max_wr_min, |
66 | .extra2 = &rds_iw_sysctl_max_wr_max, | 66 | .extra2 = &rds_iw_sysctl_max_wr_max, |
67 | }, | 67 | }, |
@@ -70,7 +70,7 @@ ctl_table rds_iw_sysctl_table[] = { | |||
70 | .data = &rds_iw_sysctl_max_recv_wr, | 70 | .data = &rds_iw_sysctl_max_recv_wr, |
71 | .maxlen = sizeof(unsigned long), | 71 | .maxlen = sizeof(unsigned long), |
72 | .mode = 0644, | 72 | .mode = 0644, |
73 | .proc_handler = &proc_doulongvec_minmax, | 73 | .proc_handler = proc_doulongvec_minmax, |
74 | .extra1 = &rds_iw_sysctl_max_wr_min, | 74 | .extra1 = &rds_iw_sysctl_max_wr_min, |
75 | .extra2 = &rds_iw_sysctl_max_wr_max, | 75 | .extra2 = &rds_iw_sysctl_max_wr_max, |
76 | }, | 76 | }, |
@@ -79,7 +79,7 @@ ctl_table rds_iw_sysctl_table[] = { | |||
79 | .data = &rds_iw_sysctl_max_unsig_wrs, | 79 | .data = &rds_iw_sysctl_max_unsig_wrs, |
80 | .maxlen = sizeof(unsigned long), | 80 | .maxlen = sizeof(unsigned long), |
81 | .mode = 0644, | 81 | .mode = 0644, |
82 | .proc_handler = &proc_doulongvec_minmax, | 82 | .proc_handler = proc_doulongvec_minmax, |
83 | .extra1 = &rds_iw_sysctl_max_unsig_wr_min, | 83 | .extra1 = &rds_iw_sysctl_max_unsig_wr_min, |
84 | .extra2 = &rds_iw_sysctl_max_unsig_wr_max, | 84 | .extra2 = &rds_iw_sysctl_max_unsig_wr_max, |
85 | }, | 85 | }, |
@@ -88,7 +88,7 @@ ctl_table rds_iw_sysctl_table[] = { | |||
88 | .data = &rds_iw_sysctl_max_unsig_bytes, | 88 | .data = &rds_iw_sysctl_max_unsig_bytes, |
89 | .maxlen = sizeof(unsigned long), | 89 | .maxlen = sizeof(unsigned long), |
90 | .mode = 0644, | 90 | .mode = 0644, |
91 | .proc_handler = &proc_doulongvec_minmax, | 91 | .proc_handler = proc_doulongvec_minmax, |
92 | .extra1 = &rds_iw_sysctl_max_unsig_bytes_min, | 92 | .extra1 = &rds_iw_sysctl_max_unsig_bytes_min, |
93 | .extra2 = &rds_iw_sysctl_max_unsig_bytes_max, | 93 | .extra2 = &rds_iw_sysctl_max_unsig_bytes_max, |
94 | }, | 94 | }, |
@@ -97,14 +97,14 @@ ctl_table rds_iw_sysctl_table[] = { | |||
97 | .data = &rds_iw_sysctl_max_recv_allocation, | 97 | .data = &rds_iw_sysctl_max_recv_allocation, |
98 | .maxlen = sizeof(unsigned long), | 98 | .maxlen = sizeof(unsigned long), |
99 | .mode = 0644, | 99 | .mode = 0644, |
100 | .proc_handler = &proc_doulongvec_minmax, | 100 | .proc_handler = proc_doulongvec_minmax, |
101 | }, | 101 | }, |
102 | { | 102 | { |
103 | .procname = "flow_control", | 103 | .procname = "flow_control", |
104 | .data = &rds_iw_sysctl_flow_control, | 104 | .data = &rds_iw_sysctl_flow_control, |
105 | .maxlen = sizeof(rds_iw_sysctl_flow_control), | 105 | .maxlen = sizeof(rds_iw_sysctl_flow_control), |
106 | .mode = 0644, | 106 | .mode = 0644, |
107 | .proc_handler = &proc_dointvec, | 107 | .proc_handler = proc_dointvec, |
108 | }, | 108 | }, |
109 | { } | 109 | { } |
110 | }; | 110 | }; |
diff --git a/net/rds/sysctl.c b/net/rds/sysctl.c index 8fb499ee3687..7829a20325d3 100644 --- a/net/rds/sysctl.c +++ b/net/rds/sysctl.c | |||
@@ -55,7 +55,7 @@ static ctl_table rds_sysctl_rds_table[] = { | |||
55 | .data = &rds_sysctl_reconnect_min_jiffies, | 55 | .data = &rds_sysctl_reconnect_min_jiffies, |
56 | .maxlen = sizeof(unsigned long), | 56 | .maxlen = sizeof(unsigned long), |
57 | .mode = 0644, | 57 | .mode = 0644, |
58 | .proc_handler = &proc_doulongvec_ms_jiffies_minmax, | 58 | .proc_handler = proc_doulongvec_ms_jiffies_minmax, |
59 | .extra1 = &rds_sysctl_reconnect_min, | 59 | .extra1 = &rds_sysctl_reconnect_min, |
60 | .extra2 = &rds_sysctl_reconnect_max_jiffies, | 60 | .extra2 = &rds_sysctl_reconnect_max_jiffies, |
61 | }, | 61 | }, |
@@ -64,7 +64,7 @@ static ctl_table rds_sysctl_rds_table[] = { | |||
64 | .data = &rds_sysctl_reconnect_max_jiffies, | 64 | .data = &rds_sysctl_reconnect_max_jiffies, |
65 | .maxlen = sizeof(unsigned long), | 65 | .maxlen = sizeof(unsigned long), |
66 | .mode = 0644, | 66 | .mode = 0644, |
67 | .proc_handler = &proc_doulongvec_ms_jiffies_minmax, | 67 | .proc_handler = proc_doulongvec_ms_jiffies_minmax, |
68 | .extra1 = &rds_sysctl_reconnect_min_jiffies, | 68 | .extra1 = &rds_sysctl_reconnect_min_jiffies, |
69 | .extra2 = &rds_sysctl_reconnect_max, | 69 | .extra2 = &rds_sysctl_reconnect_max, |
70 | }, | 70 | }, |
@@ -73,21 +73,21 @@ static ctl_table rds_sysctl_rds_table[] = { | |||
73 | .data = &rds_sysctl_max_unacked_packets, | 73 | .data = &rds_sysctl_max_unacked_packets, |
74 | .maxlen = sizeof(unsigned long), | 74 | .maxlen = sizeof(unsigned long), |
75 | .mode = 0644, | 75 | .mode = 0644, |
76 | .proc_handler = &proc_dointvec, | 76 | .proc_handler = proc_dointvec, |
77 | }, | 77 | }, |
78 | { | 78 | { |
79 | .procname = "max_unacked_bytes", | 79 | .procname = "max_unacked_bytes", |
80 | .data = &rds_sysctl_max_unacked_bytes, | 80 | .data = &rds_sysctl_max_unacked_bytes, |
81 | .maxlen = sizeof(unsigned long), | 81 | .maxlen = sizeof(unsigned long), |
82 | .mode = 0644, | 82 | .mode = 0644, |
83 | .proc_handler = &proc_dointvec, | 83 | .proc_handler = proc_dointvec, |
84 | }, | 84 | }, |
85 | { | 85 | { |
86 | .procname = "ping_enable", | 86 | .procname = "ping_enable", |
87 | .data = &rds_sysctl_ping_enable, | 87 | .data = &rds_sysctl_ping_enable, |
88 | .maxlen = sizeof(int), | 88 | .maxlen = sizeof(int), |
89 | .mode = 0644, | 89 | .mode = 0644, |
90 | .proc_handler = &proc_dointvec, | 90 | .proc_handler = proc_dointvec, |
91 | }, | 91 | }, |
92 | { } | 92 | { } |
93 | }; | 93 | }; |
diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c index c4ece9829541..d50a042f9552 100644 --- a/net/sctp/sysctl.c +++ b/net/sctp/sysctl.c | |||
@@ -237,7 +237,7 @@ static ctl_table sctp_table[] = { | |||
237 | .data = &sctp_scope_policy, | 237 | .data = &sctp_scope_policy, |
238 | .maxlen = sizeof(int), | 238 | .maxlen = sizeof(int), |
239 | .mode = 0644, | 239 | .mode = 0644, |
240 | .proc_handler = &proc_dointvec_minmax, | 240 | .proc_handler = proc_dointvec_minmax, |
241 | .extra1 = &zero, | 241 | .extra1 = &zero, |
242 | .extra2 = &addr_scope_max, | 242 | .extra2 = &addr_scope_max, |
243 | }, | 243 | }, |
diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c index f0ce326d0178..e65dcc613339 100644 --- a/net/sunrpc/sysctl.c +++ b/net/sunrpc/sysctl.c | |||
@@ -139,34 +139,34 @@ static ctl_table debug_table[] = { | |||
139 | .data = &rpc_debug, | 139 | .data = &rpc_debug, |
140 | .maxlen = sizeof(int), | 140 | .maxlen = sizeof(int), |
141 | .mode = 0644, | 141 | .mode = 0644, |
142 | .proc_handler = &proc_dodebug | 142 | .proc_handler = proc_dodebug |
143 | }, | 143 | }, |
144 | { | 144 | { |
145 | .procname = "nfs_debug", | 145 | .procname = "nfs_debug", |
146 | .data = &nfs_debug, | 146 | .data = &nfs_debug, |
147 | .maxlen = sizeof(int), | 147 | .maxlen = sizeof(int), |
148 | .mode = 0644, | 148 | .mode = 0644, |
149 | .proc_handler = &proc_dodebug | 149 | .proc_handler = proc_dodebug |
150 | }, | 150 | }, |
151 | { | 151 | { |
152 | .procname = "nfsd_debug", | 152 | .procname = "nfsd_debug", |
153 | .data = &nfsd_debug, | 153 | .data = &nfsd_debug, |
154 | .maxlen = sizeof(int), | 154 | .maxlen = sizeof(int), |
155 | .mode = 0644, | 155 | .mode = 0644, |
156 | .proc_handler = &proc_dodebug | 156 | .proc_handler = proc_dodebug |
157 | }, | 157 | }, |
158 | { | 158 | { |
159 | .procname = "nlm_debug", | 159 | .procname = "nlm_debug", |
160 | .data = &nlm_debug, | 160 | .data = &nlm_debug, |
161 | .maxlen = sizeof(int), | 161 | .maxlen = sizeof(int), |
162 | .mode = 0644, | 162 | .mode = 0644, |
163 | .proc_handler = &proc_dodebug | 163 | .proc_handler = proc_dodebug |
164 | }, | 164 | }, |
165 | { | 165 | { |
166 | .procname = "transports", | 166 | .procname = "transports", |
167 | .maxlen = 256, | 167 | .maxlen = 256, |
168 | .mode = 0444, | 168 | .mode = 0444, |
169 | .proc_handler = &proc_do_xprt, | 169 | .proc_handler = proc_do_xprt, |
170 | }, | 170 | }, |
171 | { } | 171 | { } |
172 | }; | 172 | }; |
diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c index 678cee22013f..5b8a8ff93a25 100644 --- a/net/sunrpc/xprtrdma/svc_rdma.c +++ b/net/sunrpc/xprtrdma/svc_rdma.c | |||
@@ -120,7 +120,7 @@ static ctl_table svcrdma_parm_table[] = { | |||
120 | .data = &svcrdma_max_requests, | 120 | .data = &svcrdma_max_requests, |
121 | .maxlen = sizeof(unsigned int), | 121 | .maxlen = sizeof(unsigned int), |
122 | .mode = 0644, | 122 | .mode = 0644, |
123 | .proc_handler = &proc_dointvec_minmax, | 123 | .proc_handler = proc_dointvec_minmax, |
124 | .extra1 = &min_max_requests, | 124 | .extra1 = &min_max_requests, |
125 | .extra2 = &max_max_requests | 125 | .extra2 = &max_max_requests |
126 | }, | 126 | }, |
@@ -129,7 +129,7 @@ static ctl_table svcrdma_parm_table[] = { | |||
129 | .data = &svcrdma_max_req_size, | 129 | .data = &svcrdma_max_req_size, |
130 | .maxlen = sizeof(unsigned int), | 130 | .maxlen = sizeof(unsigned int), |
131 | .mode = 0644, | 131 | .mode = 0644, |
132 | .proc_handler = &proc_dointvec_minmax, | 132 | .proc_handler = proc_dointvec_minmax, |
133 | .extra1 = &min_max_inline, | 133 | .extra1 = &min_max_inline, |
134 | .extra2 = &max_max_inline | 134 | .extra2 = &max_max_inline |
135 | }, | 135 | }, |
@@ -138,7 +138,7 @@ static ctl_table svcrdma_parm_table[] = { | |||
138 | .data = &svcrdma_ord, | 138 | .data = &svcrdma_ord, |
139 | .maxlen = sizeof(unsigned int), | 139 | .maxlen = sizeof(unsigned int), |
140 | .mode = 0644, | 140 | .mode = 0644, |
141 | .proc_handler = &proc_dointvec_minmax, | 141 | .proc_handler = proc_dointvec_minmax, |
142 | .extra1 = &min_ord, | 142 | .extra1 = &min_ord, |
143 | .extra2 = &max_ord, | 143 | .extra2 = &max_ord, |
144 | }, | 144 | }, |
@@ -148,63 +148,63 @@ static ctl_table svcrdma_parm_table[] = { | |||
148 | .data = &rdma_stat_read, | 148 | .data = &rdma_stat_read, |
149 | .maxlen = sizeof(atomic_t), | 149 | .maxlen = sizeof(atomic_t), |
150 | .mode = 0644, | 150 | .mode = 0644, |
151 | .proc_handler = &read_reset_stat, | 151 | .proc_handler = read_reset_stat, |
152 | }, | 152 | }, |
153 | { | 153 | { |
154 | .procname = "rdma_stat_recv", | 154 | .procname = "rdma_stat_recv", |
155 | .data = &rdma_stat_recv, | 155 | .data = &rdma_stat_recv, |
156 | .maxlen = sizeof(atomic_t), | 156 | .maxlen = sizeof(atomic_t), |
157 | .mode = 0644, | 157 | .mode = 0644, |
158 | .proc_handler = &read_reset_stat, | 158 | .proc_handler = read_reset_stat, |
159 | }, | 159 | }, |
160 | { | 160 | { |
161 | .procname = "rdma_stat_write", | 161 | .procname = "rdma_stat_write", |
162 | .data = &rdma_stat_write, | 162 | .data = &rdma_stat_write, |
163 | .maxlen = sizeof(atomic_t), | 163 | .maxlen = sizeof(atomic_t), |
164 | .mode = 0644, | 164 | .mode = 0644, |
165 | .proc_handler = &read_reset_stat, | 165 | .proc_handler = read_reset_stat, |
166 | }, | 166 | }, |
167 | { | 167 | { |
168 | .procname = "rdma_stat_sq_starve", | 168 | .procname = "rdma_stat_sq_starve", |
169 | .data = &rdma_stat_sq_starve, | 169 | .data = &rdma_stat_sq_starve, |
170 | .maxlen = sizeof(atomic_t), | 170 | .maxlen = sizeof(atomic_t), |
171 | .mode = 0644, | 171 | .mode = 0644, |
172 | .proc_handler = &read_reset_stat, | 172 | .proc_handler = read_reset_stat, |
173 | }, | 173 | }, |
174 | { | 174 | { |
175 | .procname = "rdma_stat_rq_starve", | 175 | .procname = "rdma_stat_rq_starve", |
176 | .data = &rdma_stat_rq_starve, | 176 | .data = &rdma_stat_rq_starve, |
177 | .maxlen = sizeof(atomic_t), | 177 | .maxlen = sizeof(atomic_t), |
178 | .mode = 0644, | 178 | .mode = 0644, |
179 | .proc_handler = &read_reset_stat, | 179 | .proc_handler = read_reset_stat, |
180 | }, | 180 | }, |
181 | { | 181 | { |
182 | .procname = "rdma_stat_rq_poll", | 182 | .procname = "rdma_stat_rq_poll", |
183 | .data = &rdma_stat_rq_poll, | 183 | .data = &rdma_stat_rq_poll, |
184 | .maxlen = sizeof(atomic_t), | 184 | .maxlen = sizeof(atomic_t), |
185 | .mode = 0644, | 185 | .mode = 0644, |
186 | .proc_handler = &read_reset_stat, | 186 | .proc_handler = read_reset_stat, |
187 | }, | 187 | }, |
188 | { | 188 | { |
189 | .procname = "rdma_stat_rq_prod", | 189 | .procname = "rdma_stat_rq_prod", |
190 | .data = &rdma_stat_rq_prod, | 190 | .data = &rdma_stat_rq_prod, |
191 | .maxlen = sizeof(atomic_t), | 191 | .maxlen = sizeof(atomic_t), |
192 | .mode = 0644, | 192 | .mode = 0644, |
193 | .proc_handler = &read_reset_stat, | 193 | .proc_handler = read_reset_stat, |
194 | }, | 194 | }, |
195 | { | 195 | { |
196 | .procname = "rdma_stat_sq_poll", | 196 | .procname = "rdma_stat_sq_poll", |
197 | .data = &rdma_stat_sq_poll, | 197 | .data = &rdma_stat_sq_poll, |
198 | .maxlen = sizeof(atomic_t), | 198 | .maxlen = sizeof(atomic_t), |
199 | .mode = 0644, | 199 | .mode = 0644, |
200 | .proc_handler = &read_reset_stat, | 200 | .proc_handler = read_reset_stat, |
201 | }, | 201 | }, |
202 | { | 202 | { |
203 | .procname = "rdma_stat_sq_prod", | 203 | .procname = "rdma_stat_sq_prod", |
204 | .data = &rdma_stat_sq_prod, | 204 | .data = &rdma_stat_sq_prod, |
205 | .maxlen = sizeof(atomic_t), | 205 | .maxlen = sizeof(atomic_t), |
206 | .mode = 0644, | 206 | .mode = 0644, |
207 | .proc_handler = &read_reset_stat, | 207 | .proc_handler = read_reset_stat, |
208 | }, | 208 | }, |
209 | { }, | 209 | { }, |
210 | }; | 210 | }; |
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c index 476816062243..7018eef1dcdd 100644 --- a/net/sunrpc/xprtrdma/transport.c +++ b/net/sunrpc/xprtrdma/transport.c | |||
@@ -90,7 +90,7 @@ static ctl_table xr_tunables_table[] = { | |||
90 | .data = &xprt_rdma_slot_table_entries, | 90 | .data = &xprt_rdma_slot_table_entries, |
91 | .maxlen = sizeof(unsigned int), | 91 | .maxlen = sizeof(unsigned int), |
92 | .mode = 0644, | 92 | .mode = 0644, |
93 | .proc_handler = &proc_dointvec_minmax, | 93 | .proc_handler = proc_dointvec_minmax, |
94 | .extra1 = &min_slot_table_size, | 94 | .extra1 = &min_slot_table_size, |
95 | .extra2 = &max_slot_table_size | 95 | .extra2 = &max_slot_table_size |
96 | }, | 96 | }, |
@@ -99,21 +99,21 @@ static ctl_table xr_tunables_table[] = { | |||
99 | .data = &xprt_rdma_max_inline_read, | 99 | .data = &xprt_rdma_max_inline_read, |
100 | .maxlen = sizeof(unsigned int), | 100 | .maxlen = sizeof(unsigned int), |
101 | .mode = 0644, | 101 | .mode = 0644, |
102 | .proc_handler = &proc_dointvec, | 102 | .proc_handler = proc_dointvec, |
103 | }, | 103 | }, |
104 | { | 104 | { |
105 | .procname = "rdma_max_inline_write", | 105 | .procname = "rdma_max_inline_write", |
106 | .data = &xprt_rdma_max_inline_write, | 106 | .data = &xprt_rdma_max_inline_write, |
107 | .maxlen = sizeof(unsigned int), | 107 | .maxlen = sizeof(unsigned int), |
108 | .mode = 0644, | 108 | .mode = 0644, |
109 | .proc_handler = &proc_dointvec, | 109 | .proc_handler = proc_dointvec, |
110 | }, | 110 | }, |
111 | { | 111 | { |
112 | .procname = "rdma_inline_write_padding", | 112 | .procname = "rdma_inline_write_padding", |
113 | .data = &xprt_rdma_inline_write_padding, | 113 | .data = &xprt_rdma_inline_write_padding, |
114 | .maxlen = sizeof(unsigned int), | 114 | .maxlen = sizeof(unsigned int), |
115 | .mode = 0644, | 115 | .mode = 0644, |
116 | .proc_handler = &proc_dointvec_minmax, | 116 | .proc_handler = proc_dointvec_minmax, |
117 | .extra1 = &zero, | 117 | .extra1 = &zero, |
118 | .extra2 = &max_padding, | 118 | .extra2 = &max_padding, |
119 | }, | 119 | }, |
@@ -122,7 +122,7 @@ static ctl_table xr_tunables_table[] = { | |||
122 | .data = &xprt_rdma_memreg_strategy, | 122 | .data = &xprt_rdma_memreg_strategy, |
123 | .maxlen = sizeof(unsigned int), | 123 | .maxlen = sizeof(unsigned int), |
124 | .mode = 0644, | 124 | .mode = 0644, |
125 | .proc_handler = &proc_dointvec_minmax, | 125 | .proc_handler = proc_dointvec_minmax, |
126 | .extra1 = &min_memreg, | 126 | .extra1 = &min_memreg, |
127 | .extra2 = &max_memreg, | 127 | .extra2 = &max_memreg, |
128 | }, | 128 | }, |
@@ -131,7 +131,7 @@ static ctl_table xr_tunables_table[] = { | |||
131 | .data = &xprt_rdma_pad_optimize, | 131 | .data = &xprt_rdma_pad_optimize, |
132 | .maxlen = sizeof(unsigned int), | 132 | .maxlen = sizeof(unsigned int), |
133 | .mode = 0644, | 133 | .mode = 0644, |
134 | .proc_handler = &proc_dointvec, | 134 | .proc_handler = proc_dointvec, |
135 | }, | 135 | }, |
136 | { }, | 136 | { }, |
137 | }; | 137 | }; |
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 8b9a2079f2e3..04732d09013e 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -85,7 +85,7 @@ static ctl_table xs_tunables_table[] = { | |||
85 | .data = &xprt_udp_slot_table_entries, | 85 | .data = &xprt_udp_slot_table_entries, |
86 | .maxlen = sizeof(unsigned int), | 86 | .maxlen = sizeof(unsigned int), |
87 | .mode = 0644, | 87 | .mode = 0644, |
88 | .proc_handler = &proc_dointvec_minmax, | 88 | .proc_handler = proc_dointvec_minmax, |
89 | .extra1 = &min_slot_table_size, | 89 | .extra1 = &min_slot_table_size, |
90 | .extra2 = &max_slot_table_size | 90 | .extra2 = &max_slot_table_size |
91 | }, | 91 | }, |
@@ -94,7 +94,7 @@ static ctl_table xs_tunables_table[] = { | |||
94 | .data = &xprt_tcp_slot_table_entries, | 94 | .data = &xprt_tcp_slot_table_entries, |
95 | .maxlen = sizeof(unsigned int), | 95 | .maxlen = sizeof(unsigned int), |
96 | .mode = 0644, | 96 | .mode = 0644, |
97 | .proc_handler = &proc_dointvec_minmax, | 97 | .proc_handler = proc_dointvec_minmax, |
98 | .extra1 = &min_slot_table_size, | 98 | .extra1 = &min_slot_table_size, |
99 | .extra2 = &max_slot_table_size | 99 | .extra2 = &max_slot_table_size |
100 | }, | 100 | }, |
@@ -103,7 +103,7 @@ static ctl_table xs_tunables_table[] = { | |||
103 | .data = &xprt_min_resvport, | 103 | .data = &xprt_min_resvport, |
104 | .maxlen = sizeof(unsigned int), | 104 | .maxlen = sizeof(unsigned int), |
105 | .mode = 0644, | 105 | .mode = 0644, |
106 | .proc_handler = &proc_dointvec_minmax, | 106 | .proc_handler = proc_dointvec_minmax, |
107 | .extra1 = &xprt_min_resvport_limit, | 107 | .extra1 = &xprt_min_resvport_limit, |
108 | .extra2 = &xprt_max_resvport_limit | 108 | .extra2 = &xprt_max_resvport_limit |
109 | }, | 109 | }, |
@@ -112,7 +112,7 @@ static ctl_table xs_tunables_table[] = { | |||
112 | .data = &xprt_max_resvport, | 112 | .data = &xprt_max_resvport, |
113 | .maxlen = sizeof(unsigned int), | 113 | .maxlen = sizeof(unsigned int), |
114 | .mode = 0644, | 114 | .mode = 0644, |
115 | .proc_handler = &proc_dointvec_minmax, | 115 | .proc_handler = proc_dointvec_minmax, |
116 | .extra1 = &xprt_min_resvport_limit, | 116 | .extra1 = &xprt_min_resvport_limit, |
117 | .extra2 = &xprt_max_resvport_limit | 117 | .extra2 = &xprt_max_resvport_limit |
118 | }, | 118 | }, |
@@ -121,7 +121,7 @@ static ctl_table xs_tunables_table[] = { | |||
121 | .data = &xs_tcp_fin_timeout, | 121 | .data = &xs_tcp_fin_timeout, |
122 | .maxlen = sizeof(xs_tcp_fin_timeout), | 122 | .maxlen = sizeof(xs_tcp_fin_timeout), |
123 | .mode = 0644, | 123 | .mode = 0644, |
124 | .proc_handler = &proc_dointvec_jiffies, | 124 | .proc_handler = proc_dointvec_jiffies, |
125 | }, | 125 | }, |
126 | { }, | 126 | { }, |
127 | }; | 127 | }; |
diff --git a/security/keys/sysctl.c b/security/keys/sysctl.c index 3565e2fc10c9..ee32d181764a 100644 --- a/security/keys/sysctl.c +++ b/security/keys/sysctl.c | |||
@@ -21,7 +21,7 @@ ctl_table key_sysctls[] = { | |||
21 | .data = &key_quota_maxkeys, | 21 | .data = &key_quota_maxkeys, |
22 | .maxlen = sizeof(unsigned), | 22 | .maxlen = sizeof(unsigned), |
23 | .mode = 0644, | 23 | .mode = 0644, |
24 | .proc_handler = &proc_dointvec_minmax, | 24 | .proc_handler = proc_dointvec_minmax, |
25 | .extra1 = (void *) &one, | 25 | .extra1 = (void *) &one, |
26 | .extra2 = (void *) &max, | 26 | .extra2 = (void *) &max, |
27 | }, | 27 | }, |
@@ -30,7 +30,7 @@ ctl_table key_sysctls[] = { | |||
30 | .data = &key_quota_maxbytes, | 30 | .data = &key_quota_maxbytes, |
31 | .maxlen = sizeof(unsigned), | 31 | .maxlen = sizeof(unsigned), |
32 | .mode = 0644, | 32 | .mode = 0644, |
33 | .proc_handler = &proc_dointvec_minmax, | 33 | .proc_handler = proc_dointvec_minmax, |
34 | .extra1 = (void *) &one, | 34 | .extra1 = (void *) &one, |
35 | .extra2 = (void *) &max, | 35 | .extra2 = (void *) &max, |
36 | }, | 36 | }, |
@@ -39,7 +39,7 @@ ctl_table key_sysctls[] = { | |||
39 | .data = &key_quota_root_maxkeys, | 39 | .data = &key_quota_root_maxkeys, |
40 | .maxlen = sizeof(unsigned), | 40 | .maxlen = sizeof(unsigned), |
41 | .mode = 0644, | 41 | .mode = 0644, |
42 | .proc_handler = &proc_dointvec_minmax, | 42 | .proc_handler = proc_dointvec_minmax, |
43 | .extra1 = (void *) &one, | 43 | .extra1 = (void *) &one, |
44 | .extra2 = (void *) &max, | 44 | .extra2 = (void *) &max, |
45 | }, | 45 | }, |
@@ -48,7 +48,7 @@ ctl_table key_sysctls[] = { | |||
48 | .data = &key_quota_root_maxbytes, | 48 | .data = &key_quota_root_maxbytes, |
49 | .maxlen = sizeof(unsigned), | 49 | .maxlen = sizeof(unsigned), |
50 | .mode = 0644, | 50 | .mode = 0644, |
51 | .proc_handler = &proc_dointvec_minmax, | 51 | .proc_handler = proc_dointvec_minmax, |
52 | .extra1 = (void *) &one, | 52 | .extra1 = (void *) &one, |
53 | .extra2 = (void *) &max, | 53 | .extra2 = (void *) &max, |
54 | }, | 54 | }, |
@@ -57,7 +57,7 @@ ctl_table key_sysctls[] = { | |||
57 | .data = &key_gc_delay, | 57 | .data = &key_gc_delay, |
58 | .maxlen = sizeof(unsigned), | 58 | .maxlen = sizeof(unsigned), |
59 | .mode = 0644, | 59 | .mode = 0644, |
60 | .proc_handler = &proc_dointvec_minmax, | 60 | .proc_handler = proc_dointvec_minmax, |
61 | .extra1 = (void *) &zero, | 61 | .extra1 = (void *) &zero, |
62 | .extra2 = (void *) &max, | 62 | .extra2 = (void *) &max, |
63 | }, | 63 | }, |