summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorJan Chochol <jan@chochol.info>2018-01-05 08:39:12 +0100
committerTrond Myklebust <trond.myklebust@primarydata.com>2018-01-18 21:10:47 +0100
commitcbebc6ef4fc830f4040d4140bf53484812d5d5d9 (patch)
tree4b1f214e7579e11f2a9b5c70b7c82869368274c1 /fs/nfs
parentnfs: Use proper enum definitions for nfs_show_stable (diff)
downloadlinux-cbebc6ef4fc830f4040d4140bf53484812d5d5d9.tar.xz
linux-cbebc6ef4fc830f4040d4140bf53484812d5d5d9.zip
nfs: Do not convert nfs_idmap_cache_timeout to jiffies
Since commit 57e62324e469 ("NFS: Store the legacy idmapper result in the keyring") nfs_idmap_cache_timeout changed units from jiffies to seconds. Unfortunately sysctl interface was not updated accordingly. As a effect updating /proc/sys/fs/nfs/idmap_cache_timeout with some value will incorrectly multiply this value by HZ. Also reading /proc/sys/fs/nfs/idmap_cache_timeout will show real value divided by HZ. Fixes: 57e62324e469 ("NFS: Store the legacy idmapper result in the keyring") Signed-off-by: Jan Chochol <jan@chochol.info> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4sysctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4sysctl.c b/fs/nfs/nfs4sysctl.c
index 0d91d84e5822..c394e4447100 100644
--- a/fs/nfs/nfs4sysctl.c
+++ b/fs/nfs/nfs4sysctl.c
@@ -32,7 +32,7 @@ static struct ctl_table nfs4_cb_sysctls[] = {
.data = &nfs_idmap_cache_timeout,
.maxlen = sizeof(int),
.mode = 0644,
- .proc_handler = proc_dointvec_jiffies,
+ .proc_handler = proc_dointvec,
},
{ }
};