| From foo@baz Sun May 27 17:33:38 CEST 2018 |
| From: Jan Chochol <jan@chochol.info> |
| Date: Fri, 5 Jan 2018 08:39:12 +0100 |
| Subject: nfs: Do not convert nfs_idmap_cache_timeout to jiffies |
| |
| From: Jan Chochol <jan@chochol.info> |
| |
| [ Upstream commit cbebc6ef4fc830f4040d4140bf53484812d5d5d9 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| fs/nfs/nfs4sysctl.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/fs/nfs/nfs4sysctl.c |
| +++ b/fs/nfs/nfs4sysctl.c |
| @@ -31,7 +31,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, |
| }, |
| { } |
| }; |