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/include | |
| parent | 3d2ec9dcd5539d421a6814ded10a1a3008e70548 (diff) | |
| download | op-kernel-dev-4671dc9f97bca650708ea3b304bb952c3b767b6a.zip op-kernel-dev-4671dc9f97bca650708ea3b304bb952c3b767b6a.tar.gz | |
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/include')
| -rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/libcfs_time.h | 2 | ||||
| -rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h index c4f25be..df7a3f1 100644 --- a/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h @@ -62,7 +62,7 @@ static inline int cfs_time_aftereq(unsigned long t1, unsigned long t2) static inline unsigned long cfs_time_shift(int seconds) { - return cfs_time_add(cfs_time_current(), seconds * HZ); + return cfs_time_add(jiffies, seconds * HZ); } /* diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h index 805cb32..ba115e8 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h +++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h @@ -60,18 +60,11 @@ * Generic kernel stuff */ -static inline unsigned long cfs_time_current(void) -{ - return jiffies; -} - static inline long cfs_duration_sec(long d) { return d / msecs_to_jiffies(MSEC_PER_SEC); } -#define cfs_time_current_64 get_jiffies_64 - static inline u64 cfs_time_add_64(u64 t, u64 d) { return t + d; @@ -79,7 +72,7 @@ static inline u64 cfs_time_add_64(u64 t, u64 d) static inline u64 cfs_time_shift_64(int seconds) { - return cfs_time_add_64(cfs_time_current_64(), + return cfs_time_add_64(get_jiffies_64(), seconds * HZ); } |
