Commit 82173c62 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

staging: lustre: remove cfs_time_beforeq wrapper

Use time_before_eq() call instead.

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a649ad1d
...@@ -60,7 +60,7 @@ static inline int cfs_time_after(unsigned long t1, unsigned long t2) ...@@ -60,7 +60,7 @@ static inline int cfs_time_after(unsigned long t1, unsigned long t2)
static inline int cfs_time_aftereq(unsigned long t1, unsigned long t2) static inline int cfs_time_aftereq(unsigned long t1, unsigned long t2)
{ {
return cfs_time_beforeq(t2, t1); return time_before_eq(t2, t1);
} }
static inline unsigned long cfs_time_shift(int seconds) static inline unsigned long cfs_time_shift(int seconds)
......
...@@ -114,11 +114,6 @@ static inline int cfs_time_before(unsigned long t1, unsigned long t2) ...@@ -114,11 +114,6 @@ static inline int cfs_time_before(unsigned long t1, unsigned long t2)
return time_before(t1, t2); return time_before(t1, t2);
} }
static inline int cfs_time_beforeq(unsigned long t1, unsigned long t2)
{
return time_before_eq(t1, t2);
}
static inline unsigned long cfs_time_current(void) static inline unsigned long cfs_time_current(void)
{ {
return jiffies; return jiffies;
......
...@@ -279,7 +279,7 @@ static inline int capa_is_expired_sec(struct lustre_capa *capa) ...@@ -279,7 +279,7 @@ static inline int capa_is_expired_sec(struct lustre_capa *capa)
static inline int capa_is_expired(struct obd_capa *ocapa) static inline int capa_is_expired(struct obd_capa *ocapa)
{ {
return cfs_time_beforeq(ocapa->c_expiry, cfs_time_current()); return time_before_eq(ocapa->c_expiry, cfs_time_current());
} }
static inline int capa_opc_supported(struct lustre_capa *capa, __u64 opc) static inline int capa_opc_supported(struct lustre_capa *capa, __u64 opc)
......
...@@ -88,7 +88,7 @@ static inline unsigned long capa_renewal_time(struct obd_capa *ocapa) ...@@ -88,7 +88,7 @@ static inline unsigned long capa_renewal_time(struct obd_capa *ocapa)
static inline int capa_is_to_expire(struct obd_capa *ocapa) static inline int capa_is_to_expire(struct obd_capa *ocapa)
{ {
return cfs_time_beforeq(capa_renewal_time(ocapa), cfs_time_current()); return time_before_eq(capa_renewal_time(ocapa), cfs_time_current());
} }
static inline int have_expired_capa(void) static inline int have_expired_capa(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment