staging: lustre: remove cfs_time_beforeq wrapper

This change “staging: lustre: remove cfs_time_beforeq wrapper” (commit 82173c6) in Linux kernel is authored by Greg Kroah-Hartman <gregkh [at] linuxfoundation.org> on Sat Jul 12 00:31:18 2014 -0700.

Description of "staging: lustre: remove cfs_time_beforeq wrapper"

The change “staging: lustre: remove cfs_time_beforeq wrapper” introduces changes as follows.

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>

Linux kernel releases containing commit 82173c6

The Linux kernel releases containing this commit are as follows.

Linux kernel code changes from "staging: lustre: remove cfs_time_beforeq wrapper"

There are 11 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/staging/lustre/include/linux/libcfs/libcfs_time.h    | 2 +-
 .../staging/lustre/include/linux/libcfs/linux/linux-time.h   | 5 -----
 drivers/staging/lustre/lustre/include/lustre_capa.h          | 2 +-
 drivers/staging/lustre/lustre/llite/llite_capa.c             | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)
 
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h
index 73c51e2fae75..85cfb76d5f03 100644
--- 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 cf29fc8213ba..96a99b1713b3 100644
--- 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 37bd07865e4d..08f24bdd3071 100644
--- 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 0bf8400536bf..2ec55bb4c8d1 100644
--- 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)

The commit for this change in Linux stable tree is 82173c6 (patch).

Last modified: 2020/02/10