diff options
Diffstat (limited to 'fs/lockd')
-rw-r--r-- | fs/lockd/svc.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 1a54ae14a192..307ed4c3e1f5 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c | |||
@@ -371,7 +371,6 @@ EXPORT_SYMBOL_GPL(lockd_down); | |||
371 | 371 | ||
372 | static ctl_table nlm_sysctls[] = { | 372 | static ctl_table nlm_sysctls[] = { |
373 | { | 373 | { |
374 | .ctl_name = CTL_UNNUMBERED, | ||
375 | .procname = "nlm_grace_period", | 374 | .procname = "nlm_grace_period", |
376 | .data = &nlm_grace_period, | 375 | .data = &nlm_grace_period, |
377 | .maxlen = sizeof(unsigned long), | 376 | .maxlen = sizeof(unsigned long), |
@@ -381,7 +380,6 @@ static ctl_table nlm_sysctls[] = { | |||
381 | .extra2 = (unsigned long *) &nlm_grace_period_max, | 380 | .extra2 = (unsigned long *) &nlm_grace_period_max, |
382 | }, | 381 | }, |
383 | { | 382 | { |
384 | .ctl_name = CTL_UNNUMBERED, | ||
385 | .procname = "nlm_timeout", | 383 | .procname = "nlm_timeout", |
386 | .data = &nlm_timeout, | 384 | .data = &nlm_timeout, |
387 | .maxlen = sizeof(unsigned long), | 385 | .maxlen = sizeof(unsigned long), |
@@ -391,7 +389,6 @@ static ctl_table nlm_sysctls[] = { | |||
391 | .extra2 = (unsigned long *) &nlm_timeout_max, | 389 | .extra2 = (unsigned long *) &nlm_timeout_max, |
392 | }, | 390 | }, |
393 | { | 391 | { |
394 | .ctl_name = CTL_UNNUMBERED, | ||
395 | .procname = "nlm_udpport", | 392 | .procname = "nlm_udpport", |
396 | .data = &nlm_udpport, | 393 | .data = &nlm_udpport, |
397 | .maxlen = sizeof(int), | 394 | .maxlen = sizeof(int), |
@@ -401,7 +398,6 @@ static ctl_table nlm_sysctls[] = { | |||
401 | .extra2 = (int *) &nlm_port_max, | 398 | .extra2 = (int *) &nlm_port_max, |
402 | }, | 399 | }, |
403 | { | 400 | { |
404 | .ctl_name = CTL_UNNUMBERED, | ||
405 | .procname = "nlm_tcpport", | 401 | .procname = "nlm_tcpport", |
406 | .data = &nlm_tcpport, | 402 | .data = &nlm_tcpport, |
407 | .maxlen = sizeof(int), | 403 | .maxlen = sizeof(int), |
@@ -411,7 +407,6 @@ static ctl_table nlm_sysctls[] = { | |||
411 | .extra2 = (int *) &nlm_port_max, | 407 | .extra2 = (int *) &nlm_port_max, |
412 | }, | 408 | }, |
413 | { | 409 | { |
414 | .ctl_name = CTL_UNNUMBERED, | ||
415 | .procname = "nsm_use_hostnames", | 410 | .procname = "nsm_use_hostnames", |
416 | .data = &nsm_use_hostnames, | 411 | .data = &nsm_use_hostnames, |
417 | .maxlen = sizeof(int), | 412 | .maxlen = sizeof(int), |
@@ -419,34 +414,31 @@ static ctl_table nlm_sysctls[] = { | |||
419 | .proc_handler = &proc_dointvec, | 414 | .proc_handler = &proc_dointvec, |
420 | }, | 415 | }, |
421 | { | 416 | { |
422 | .ctl_name = CTL_UNNUMBERED, | ||
423 | .procname = "nsm_local_state", | 417 | .procname = "nsm_local_state", |
424 | .data = &nsm_local_state, | 418 | .data = &nsm_local_state, |
425 | .maxlen = sizeof(int), | 419 | .maxlen = sizeof(int), |
426 | .mode = 0644, | 420 | .mode = 0644, |
427 | .proc_handler = &proc_dointvec, | 421 | .proc_handler = &proc_dointvec, |
428 | }, | 422 | }, |
429 | { .ctl_name = 0 } | 423 | { } |
430 | }; | 424 | }; |
431 | 425 | ||
432 | static ctl_table nlm_sysctl_dir[] = { | 426 | static ctl_table nlm_sysctl_dir[] = { |
433 | { | 427 | { |
434 | .ctl_name = CTL_UNNUMBERED, | ||
435 | .procname = "nfs", | 428 | .procname = "nfs", |
436 | .mode = 0555, | 429 | .mode = 0555, |
437 | .child = nlm_sysctls, | 430 | .child = nlm_sysctls, |
438 | }, | 431 | }, |
439 | { .ctl_name = 0 } | 432 | { } |
440 | }; | 433 | }; |
441 | 434 | ||
442 | static ctl_table nlm_sysctl_root[] = { | 435 | static ctl_table nlm_sysctl_root[] = { |
443 | { | 436 | { |
444 | .ctl_name = CTL_FS, | ||
445 | .procname = "fs", | 437 | .procname = "fs", |
446 | .mode = 0555, | 438 | .mode = 0555, |
447 | .child = nlm_sysctl_dir, | 439 | .child = nlm_sysctl_dir, |
448 | }, | 440 | }, |
449 | { .ctl_name = 0 } | 441 | { } |
450 | }; | 442 | }; |
451 | 443 | ||
452 | #endif /* CONFIG_SYSCTL */ | 444 | #endif /* CONFIG_SYSCTL */ |