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/osc/osc_object.c | |
| parent | staging: lustre: libcfs: discard cfs_time_shift(). (diff) | |
| download | linux-dev-b49946b2e49068efbc4a53f4ffca4fc9e6d07fe0.tar.xz linux-dev-b49946b2e49068efbc4a53f4ffca4fc9e6d07fe0.zip | |
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/osc/osc_object.c')
| -rw-r--r-- | drivers/staging/lustre/lustre/osc/osc_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/osc/osc_object.c b/drivers/staging/lustre/lustre/osc/osc_object.c index 4adda26a9704..4f81dd16f4f5 100644 --- a/drivers/staging/lustre/lustre/osc/osc_object.c +++ b/drivers/staging/lustre/lustre/osc/osc_object.c @@ -328,7 +328,7 @@ int osc_object_is_contended(struct osc_object *obj) * ll_file_is_contended. */ retry_time = obj->oo_contention_time + osc_contention_time * HZ; - if (cfs_time_after(cur_time, retry_time)) { + if (time_after(cur_time, retry_time)) { osc_object_clear_contended(obj); return 0; } |