Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7ee91ec14bd4def036b4084da29869382078e44b

Authored by Steve Dickson
Committed by Linus Torvalds
1 parent 068e1b94bb
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] NFS: procfs/sysctl interfaces for lockd do not work on x86_64 

Allow the setting of NLM timeouts and grace periods through the proc and
sysclt interfaces on x86_64 architectures

Signed-off-by: Steve Dickson <steved@redhat.com>
Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -331,7 +331,7 @@
331 331 .ctl_name = CTL_UNNUMBERED,
332 332 .procname = "nlm_grace_period",
333 333 .data = &nlm_grace_period,
334   - .maxlen = sizeof(int),
  334 + .maxlen = sizeof(unsigned long),
335 335 .mode = 0644,
336 336 .proc_handler = &proc_doulongvec_minmax,
337 337 .extra1 = (unsigned long *) &nlm_grace_period_min,
... ... @@ -341,7 +341,7 @@
341 341 .ctl_name = CTL_UNNUMBERED,
342 342 .procname = "nlm_timeout",
343 343 .data = &nlm_timeout,
344   - .maxlen = sizeof(int),
  344 + .maxlen = sizeof(unsigned long),
345 345 .mode = 0644,
346 346 .proc_handler = &proc_doulongvec_minmax,
347 347 .extra1 = (unsigned long *) &nlm_timeout_min,