diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-19 17:49:39 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-19 17:49:39 -0400 |
| commit | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (patch) | |
| tree | 42a0c0408fcf76024eb6885a27d4f1ed0228abcf /fs/lockd/svc.c | |
| parent | ce625a801664d8ed7344117bbb57510e4e0e872c (diff) | |
| parent | f60f700876cd51de9de69f3a3c865d95e287a24d (diff) | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'fs/lockd/svc.c')
| -rw-r--r-- | fs/lockd/svc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 6e242556b903..12a857c29e25 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c | |||
| @@ -331,7 +331,7 @@ static ctl_table nlm_sysctls[] = { | |||
| 331 | .ctl_name = CTL_UNNUMBERED, | 331 | .ctl_name = CTL_UNNUMBERED, |
| 332 | .procname = "nlm_grace_period", | 332 | .procname = "nlm_grace_period", |
| 333 | .data = &nlm_grace_period, | 333 | .data = &nlm_grace_period, |
| 334 | .maxlen = sizeof(int), | 334 | .maxlen = sizeof(unsigned long), |
| 335 | .mode = 0644, | 335 | .mode = 0644, |
| 336 | .proc_handler = &proc_doulongvec_minmax, | 336 | .proc_handler = &proc_doulongvec_minmax, |
| 337 | .extra1 = (unsigned long *) &nlm_grace_period_min, | 337 | .extra1 = (unsigned long *) &nlm_grace_period_min, |
| @@ -341,7 +341,7 @@ static ctl_table nlm_sysctls[] = { | |||
| 341 | .ctl_name = CTL_UNNUMBERED, | 341 | .ctl_name = CTL_UNNUMBERED, |
| 342 | .procname = "nlm_timeout", | 342 | .procname = "nlm_timeout", |
| 343 | .data = &nlm_timeout, | 343 | .data = &nlm_timeout, |
| 344 | .maxlen = sizeof(int), | 344 | .maxlen = sizeof(unsigned long), |
| 345 | .mode = 0644, | 345 | .mode = 0644, |
| 346 | .proc_handler = &proc_doulongvec_minmax, | 346 | .proc_handler = &proc_doulongvec_minmax, |
| 347 | .extra1 = (unsigned long *) &nlm_timeout_min, | 347 | .extra1 = (unsigned long *) &nlm_timeout_min, |