Commit 7264b8a5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: lustre: remove cfs_time_current_sec wrapper 



Just call get_seconds() directly.

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 82173c62

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

+0 −5
Original line number Diff line number Diff line
@@ -119,11 +119,6 @@ static inline unsigned long cfs_time_current(void) 
	return jiffies;

}



static inline time_t cfs_time_current_sec(void)

{

	return get_seconds();

}



static inline void cfs_fs_time_current(struct timespec *t)

{

	*t = CURRENT_TIME;

drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c

+1 −1
Original line number Diff line number Diff line
@@ -2445,7 +2445,7 @@ ksocknal_base_startup(void) 


	ksocknal_data.ksnd_connd_starting	 = 0;

	ksocknal_data.ksnd_connd_failed_stamp     = 0;

	ksocknal_data.ksnd_connd_starting_stamp   = cfs_time_current_sec();

	ksocknal_data.ksnd_connd_starting_stamp   = get_seconds();

	/* must have at least 2 connds to remain responsive to accepts while

	 * connecting */

	if (*ksocknal_tunables.ksnd_nconnds < SOCKNAL_CONND_RESV + 1)

drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c

+2 −2
Original line number Diff line number Diff line
@@ -2059,7 +2059,7 @@ ksocknal_connd_check_start(long sec, long *timeout) 
	/* we tried ... */

	LASSERT(ksocknal_data.ksnd_connd_starting > 0);

	ksocknal_data.ksnd_connd_starting--;

	ksocknal_data.ksnd_connd_failed_stamp = cfs_time_current_sec();

	ksocknal_data.ksnd_connd_failed_stamp = get_seconds();



	return 1;

}
@@ -2152,7 +2152,7 @@ ksocknal_connd (void *arg) 


	while (!ksocknal_data.ksnd_shuttingdown) {

		ksock_route_t *route = NULL;

		long sec = cfs_time_current_sec();

		long sec = get_seconds();

		long timeout = MAX_SCHEDULE_TIMEOUT;

		int  dropped_lock = 0;

drivers/staging/lustre/lnet/lnet/api-ni.c

+1 −1
Original line number Diff line number Diff line
@@ -1452,7 +1452,7 @@ LNetCtl(unsigned int cmd, void *arg) 
	case IOC_LIBCFS_NOTIFY_ROUTER:

		return lnet_notify(NULL, data->ioc_nid, data->ioc_flags,

				   cfs_time_current() -

				   cfs_time_seconds(cfs_time_current_sec() -

				   cfs_time_seconds(get_seconds() -

						    (time_t)data->ioc_u64[0]));



	case IOC_LIBCFS_PORTALS_COMPATIBILITY:

drivers/staging/lustre/lnet/lnet/config.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ lnet_ni_alloc(__u32 net, struct cfs_expr_list *el, struct list_head *nilist) 


	/* LND will fill in the address part of the NID */

	ni->ni_nid = LNET_MKNID(net, 0);

	ni->ni_last_alive = cfs_time_current_sec();

	ni->ni_last_alive = get_seconds();

	list_add_tail(&ni->ni_list, nilist);

	return ni;

 failed:

CRA Git | Maintained and supported by SUSTech CRA and CCSE