openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Greg Kroah-Hartman 2014-07-12 00:31:18 -07:00
parent a649ad1d7b
commit 82173c6292
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/lustre/include/linux/libcfs/libcfs_time.h
View File

@ -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)

5
drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h
View File

@ -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;

2
drivers/staging/lustre/lustre/include/lustre_capa.h
View File

@ -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)

2
drivers/staging/lustre/lustre/llite/llite_capa.c
View File

@ -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)