diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-12 00:27:46 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-12 00:27:46 -0700 |
| commit | a649ad1d7b44d2b5da62eec804539bb221396570 (patch) | |
| tree | dd03c366785989fd41ab413e27ea71d3dd37161a /drivers/staging/lustre/lustre/osc/osc_object.c | |
| parent | staging: lustre: remove unused functions from linux-time.h (diff) | |
| download | linux-dev-a649ad1d7b44d2b5da62eec804539bb221396570.tar.xz linux-dev-a649ad1d7b44d2b5da62eec804539bb221396570.zip | |
staging: lustre: remove cfs_time_t typedef
Just use unsigned long everywhere, like the rest of the kernel does.
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: hpdd-discuss <hpdd-discuss@lists.01.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 f9bfdc820125..155a2dbe5b69 100644 --- a/drivers/staging/lustre/lustre/osc/osc_object.c +++ b/drivers/staging/lustre/lustre/osc/osc_object.c @@ -213,8 +213,8 @@ 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; - cfs_time_t cur_time = cfs_time_current(); - cfs_time_t retry_time; + unsigned long cur_time = cfs_time_current(); + unsigned long retry_time; if (OBD_FAIL_CHECK(OBD_FAIL_OSC_OBJECT_CONTENTION)) return 1; |