diff options
| author | Oleg Drokin <green@linuxhacker.ru> | 2015-07-06 12:48:45 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-13 19:47:20 -0700 |
| commit | 082a33441f5e0f8b59b6a7297fdfca064d55fb26 (patch) | |
| tree | dd25a43d938b5be0c180ce20cd585f865fae6e00 /drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | |
| parent | 2836cd81a9ca8d3fc7c86fe4167b8053d784e725 (diff) | |
staging/lustre: Remove unneeded ldlm_timeout control
ldlm_timeout is used server-side to determine AST timeouts,
so it makes no sense on the client, esp. since it's not really used
anywhere.
Remove all traces of it except from the config where make
it a noop.
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c')
| -rw-r--r-- | drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c index 941eb4e72039..ac79db952da7 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c @@ -76,15 +76,6 @@ inline unsigned long round_timeout(unsigned long timeout) return cfs_time_seconds((int)cfs_duration_sec(cfs_time_sub(timeout, 0)) + 1); } -/* timeout for initial callback (AST) reply (bz10399) */ -static inline unsigned int ldlm_get_rq_timeout(void) -{ - /* Non-AT value */ - unsigned int timeout = min(ldlm_timeout, obd_timeout / 3); - - return timeout < 1 ? 1 : timeout; -} - #define ELT_STOPPED 0 #define ELT_READY 1 #define ELT_TERMINATE 2 |