diff options
| author | NeilBrown <neilb@suse.de> | 2024-07-15 10:14:14 +0300 |
|---|---|---|
| committer | Chuck Lever <chuck.lever@oracle.com> | 2024-09-01 17:04:56 +0300 |
| commit | 4ed9ef32606386efc562bada891d7baa16fc46b4 (patch) | |
| tree | 80fc169923040a27a48acad26e84bc03e1117157 /include/linux/lockd | |
| parent | 8203ab8a9dbe7b2a060fa6bdbfe2f28cb2f73172 (diff) | |
| download | linux-4ed9ef32606386efc562bada891d7baa16fc46b4.tar.xz | |
lockd: discard nlmsvc_timeout
nlmsvc_timeout always has the same value as (nlm_timeout * HZ), so use
that in the one place that nlmsvc_timeout is used.
In truth it *might* not always be the same as nlmsvc_timeout is only set
when lockd is started while nlm_timeout can be set at anytime via
sysctl. I think this difference it not helpful so removing it is good.
Also remove the test for nlm_timout being 0. This is not possible -
unless a module parameter is used to set the minimum timeout to 0, and
if that happens then it probably should be honoured.
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'include/linux/lockd')
| -rw-r--r-- | include/linux/lockd/lockd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index 1b95fe31051f..61c4b9c41904 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h @@ -200,7 +200,7 @@ extern const struct svc_procedure nlmsvc_procedures[24]; extern const struct svc_procedure nlmsvc_procedures4[24]; #endif extern int nlmsvc_grace_period; -extern unsigned long nlmsvc_timeout; +extern unsigned long nlm_timeout; extern bool nsm_use_hostnames; extern u32 nsm_local_state; |