diff options
| author | NeilBrown <neilb@suse.com> | 2018-02-13 08:22:36 +1100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-16 15:19:10 +0100 |
| commit | 672b63e55bdee71150e3cc472f6294e0535a95ad (patch) | |
| tree | 4b3c119fbce03abf0ccf2ef77139526e6189c230 /drivers/staging/lustre/lustre/ldlm/ldlm_request.c | |
| parent | db1d6cbc2a2c7f9fa3ae71b999a73e827d0f43ae (diff) | |
| download | op-kernel-dev-672b63e55bdee71150e3cc472f6294e0535a95ad.zip op-kernel-dev-672b63e55bdee71150e3cc472f6294e0535a95ad.tar.gz | |
staging: lustre: discard cfs_time_seconds()
cfs_time_seconds() converts a number of seconds to the
matching number of jiffies.
The standard way to do this in Linux is "* HZ".
So discard cfs_time_seconds() and use "* HZ" instead.
Reviewed-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: NeilBrown <neilb@suse.com>
Reviewed-by: Patrick Farrell <paf@cray.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lustre/ldlm/ldlm_request.c')
| -rw-r--r-- | drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c index 6aa3746..a244fa7 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c @@ -288,7 +288,7 @@ noreproc: LDLM_DEBUG(lock, "waiting indefinitely because of NO_TIMEOUT"); lwi = LWI_INTR(interrupted_completion_wait, &lwd); } else { - lwi = LWI_TIMEOUT_INTR(cfs_time_seconds(timeout), + lwi = LWI_TIMEOUT_INTR(timeout * HZ, ldlm_expired_completion_wait, interrupted_completion_wait, &lwd); } |
