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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h
index 73c51e2fae75b7874316226ecec844f410e95ab8..85cfb76d5f038cc9db7086c6592d279c6b65cdeb 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h
@@ -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)
 {
-       return cfs_time_beforeq(t2, t1);
+       return time_before_eq(t2, t1);
 }
 
 static inline unsigned long cfs_time_shift(int seconds)

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 cf29fc8213ba4496b79a7f5f334464b5e8a58b44..96a99b1713b33005e56541ef8231d499265c5d87 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h
@@ -114,11 +114,6 @@ static inline int cfs_time_before(unsigned long t1, unsigned long 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)
 {
        return jiffies;

diff --git a/drivers/staging/lustre/lustre/include/lustre_capa.h b/drivers/staging/lustre/lustre/include/lustre_capa.h
index 37bd07865e4debb73d3f0eca54af97ea4fd3f6b3..08f24bdd3071fb0b4ef02513d749b3224a9f1457 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_capa.h
+++ b/drivers/staging/lustre/lustre/include/lustre_capa.h
@@ -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)
 {
-       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)

diff --git a/drivers/staging/lustre/lustre/llite/llite_capa.c b/drivers/staging/lustre/lustre/llite/llite_capa.c
index 0bf8400536bf9f1a914c3b7d4d111ed77a4d4176..2ec55bb4c8d156f7611ab5b09fa0393338471a75 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/llite_capa.c
+++ b/drivers/staging/lustre/lustre/llite/llite_capa.c
@@ -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)
 {
-       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)