Commit de15ec21 authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

staging: lustre: discard cfs_time_before_64() 



cfs_time_before_64 is the same as time_before64()
similarly cfs_time_beforeq_64() matsches time_before_eq64()
So just use the standard interfaces.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Reviewed-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2d44d958

drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h

+0 −14
Original line number Diff line number Diff line
@@ -56,20 +56,6 @@ 


#include <linux/jiffies.h>



/*

 * Generic kernel stuff

 */



static inline int cfs_time_before_64(u64 t1, u64 t2)

{

	return (__s64)t2 - (__s64)t1 > 0;

}



static inline int cfs_time_beforeq_64(u64 t1, u64 t2)

{

	return (__s64)t2 - (__s64)t1 >= 0;

}



/*

 * One jiffy

 */

drivers/staging/lustre/lustre/include/obd_class.h

+2 −2
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ static inline int obd_statfs_async(struct obd_export *exp, 


	CDEBUG(D_SUPER, "%s: osfs %p age %llu, max_age %llu\n",

	       obd->obd_name, &obd->obd_osfs, obd->obd_osfs_age, max_age);

	if (cfs_time_before_64(obd->obd_osfs_age, max_age)) {

	if (time_before64(obd->obd_osfs_age, max_age)) {

		rc = OBP(obd, statfs_async)(exp, oinfo, max_age, rqset);

	} else {

		CDEBUG(D_SUPER,
@@ -992,7 +992,7 @@ static inline int obd_statfs(const struct lu_env *env, struct obd_export *exp, 


	CDEBUG(D_SUPER, "osfs %llu, max_age %llu\n",

	       obd->obd_osfs_age, max_age);

	if (cfs_time_before_64(obd->obd_osfs_age, max_age)) {

	if (time_before64(obd->obd_osfs_age, max_age)) {

		rc = OBP(obd, statfs)(env, exp, osfs, max_age, flags);

		if (rc == 0) {

			spin_lock(&obd->obd_osfs_lock);

drivers/staging/lustre/lustre/ptlrpc/import.c

+2 −2
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static int import_select_connection(struct obd_import *imp) 
		 * the last successful attempt, go with this one

		 */

		if ((conn->oic_last_attempt == 0) ||

		    cfs_time_beforeq_64(conn->oic_last_attempt,

		    time_before_eq64(conn->oic_last_attempt,

					imp->imp_last_success_conn)) {

			imp_conn = conn;

			tried_all = 0;
@@ -476,7 +476,7 @@ static int import_select_connection(struct obd_import *imp) 
		 */

		if (!imp_conn)

			imp_conn = conn;

		else if (cfs_time_before_64(conn->oic_last_attempt,

		else if (time_before64(conn->oic_last_attempt,

					    imp_conn->oic_last_attempt))

			imp_conn = conn;

	}