Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbebc6ef authored by Jan Chochol's avatar Jan Chochol Committed by Trond Myklebust
Browse files

nfs: Do not convert nfs_idmap_cache_timeout to jiffies 



Since commit 57e62324 ("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: 57e62324 ("NFS: Store the legacy idmapper result in the keyring")
Signed-off-by: default avatarJan Chochol <jan@chochol.info>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 06e19024

fs/nfs/nfs4sysctl.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

	},

	{ }

};