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:51 +0200 |
| commit | 4671dc9f97bca650708ea3b304bb952c3b767b6a (patch) | |
| tree | 5d062b838cbf9f19a51798cef91131c540872723 /drivers/staging/lustre/lustre/osc/osc_object.c | |
| parent | staging: Android: Add 'vsoc' driver for cuttlefish. (diff) | |
| download | linux-dev-4671dc9f97bca650708ea3b304bb952c3b767b6a.tar.xz linux-dev-4671dc9f97bca650708ea3b304bb952c3b767b6a.zip | |
staging: lustre: cfs_time_current() -> jiffies.
Discard cfs_time_current() and cfs_time_current64()
and use jiffies and get_jiffies_64() like the rest of the kernel.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/lustre/lustre/osc/osc_object.c b/drivers/staging/lustre/lustre/osc/osc_object.c index 6baa8e2e00c9..f4984a8e8a0d 100644 --- a/drivers/staging/lustre/lustre/osc/osc_object.c +++ b/drivers/staging/lustre/lustre/osc/osc_object.c @@ -300,7 +300,7 @@ drop_lock: void osc_object_set_contended(struct osc_object *obj) { - obj->oo_contention_time = cfs_time_current(); + obj->oo_contention_time = jiffies; /* mb(); */ obj->oo_contended = 1; } @@ -314,7 +314,7 @@ int osc_object_is_contended(struct osc_object *obj) { struct osc_device *dev = lu2osc_dev(obj->oo_cl.co_lu.lo_dev); int osc_contention_time = dev->od_contention_time; - unsigned long cur_time = cfs_time_current(); + unsigned long cur_time = jiffies; unsigned long retry_time; if (OBD_FAIL_CHECK(OBD_FAIL_OSC_OBJECT_CONTENTION)) |