diff options
| author | NeilBrown <neilb@suse.com> | 2018-03-29 15:26:48 +1100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-23 14:52:52 +0200 |
| commit | b49946b2e49068efbc4a53f4ffca4fc9e6d07fe0 (patch) | |
| tree | ad4169fcb368a3aac098fedb8c0aff1f381cbbda /drivers/staging/lustre/lustre/ldlm/ldlm_request.c | |
| parent | e990f1c6eccd6389c3ce321d8bf05cdb0747b761 (diff) | |
| download | op-kernel-dev-b49946b2e49068efbc4a53f4ffca4fc9e6d07fe0.zip op-kernel-dev-b49946b2e49068efbc4a53f4ffca4fc9e6d07fe0.tar.gz | |
staging: lustre: libcfs: discard cfs_time_after()
cfs_time_after() behaves exactly like time_after()
similarly cfs_time_aftereq() matches time_after_eq()
so discard the cfs versions.
Signed-off-by: NeilBrown <neilb@suse.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c index 647e85b..1870950 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c @@ -116,7 +116,7 @@ static void ldlm_expired_completion_wait(struct ldlm_lock *lock, __u32 conn_cnt) (s64)lock->l_last_activity, (s64)(ktime_get_real_seconds() - lock->l_last_activity)); - if (cfs_time_after(jiffies, next_dump)) { + if (time_after(jiffies, next_dump)) { last_dump = next_dump; next_dump = jiffies + 300 * HZ; ldlm_namespace_dump(D_DLMTRACE, @@ -1176,7 +1176,7 @@ static enum ldlm_policy_res ldlm_cancel_lrur_policy(struct ldlm_namespace *ns, * Despite of the LV, It doesn't make sense to keep the lock which * is unused for ns_max_age time. */ - if (cfs_time_after(jiffies, lock->l_last_used + ns->ns_max_age)) + if (time_after(jiffies, lock->l_last_used + ns->ns_max_age)) return LDLM_POLICY_CANCEL_LOCK; slv = ldlm_pool_get_slv(pl); |
