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

staging: lustre: cfs_time_current() -> jiffies. 



Discard cfs_time_current() and cfs_time_current64()
and use jiffies and get_jiffies_64() like the rest of the kernel.

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 3d2ec9dc

drivers/staging/lustre/include/linux/libcfs/libcfs_time.h

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static inline int cfs_time_aftereq(unsigned long t1, unsigned long t2) 


static inline unsigned long cfs_time_shift(int seconds)

{

	return cfs_time_add(cfs_time_current(), seconds * HZ);

	return cfs_time_add(jiffies, seconds * HZ);

}



/*

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

+1 −8
Original line number Diff line number Diff line
@@ -60,18 +60,11 @@ 
 * Generic kernel stuff

 */



static inline unsigned long cfs_time_current(void)

{

	return jiffies;

}



static inline long cfs_duration_sec(long d)

{

	return d / msecs_to_jiffies(MSEC_PER_SEC);

}



#define cfs_time_current_64 get_jiffies_64



static inline u64 cfs_time_add_64(u64 t, u64 d)

{

	return t + d;
@@ -79,7 +72,7 @@ static inline u64 cfs_time_add_64(u64 t, u64 d) 


static inline u64 cfs_time_shift_64(int seconds)

{

	return cfs_time_add_64(cfs_time_current_64(),

	return cfs_time_add_64(get_jiffies_64(),

			       seconds * HZ);

}

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

+7 −7
Original line number Diff line number Diff line
@@ -1043,7 +1043,7 @@ static void kiblnd_query(struct lnet_ni *ni, lnet_nid_t nid, 
			 unsigned long *when)

{

	unsigned long last_alive = 0;

	unsigned long now = cfs_time_current();

	unsigned long now = jiffies;

	rwlock_t *glock = &kiblnd_data.kib_global_lock;

	struct kib_peer *peer;

	unsigned long flags;
@@ -1552,7 +1552,7 @@ void kiblnd_fmr_pool_unmap(struct kib_fmr *fmr, int status) 
	LIST_HEAD(zombies);

	struct kib_fmr_pool *fpo = fmr->fmr_pool;

	struct kib_fmr_poolset *fps;

	unsigned long now = cfs_time_current();

	unsigned long now = jiffies;

	struct kib_fmr_pool *tmp;

	int rc;
@@ -1726,7 +1726,7 @@ int kiblnd_fmr_pool_map(struct kib_fmr_poolset *fps, struct kib_tx *tx, 
		goto again;

	}



	if (time_before(cfs_time_current(), fps->fps_next_retry)) {

	if (time_before(jiffies, fps->fps_next_retry)) {

		/* someone failed recently */

		spin_unlock(&fps->fps_lock);

		return -EAGAIN;
@@ -1858,7 +1858,7 @@ void kiblnd_pool_free_node(struct kib_pool *pool, struct list_head *node) 
	LIST_HEAD(zombies);

	struct kib_poolset *ps = pool->po_owner;

	struct kib_pool *tmp;

	unsigned long now = cfs_time_current();

	unsigned long now = jiffies;



	spin_lock(&ps->ps_lock);
@@ -1927,7 +1927,7 @@ struct list_head *kiblnd_pool_alloc_node(struct kib_poolset *ps) 
		goto again;

	}



	if (time_before(cfs_time_current(), ps->ps_next_retry)) {

	if (time_before(jiffies, ps->ps_next_retry)) {

		/* someone failed recently */

		spin_unlock(&ps->ps_lock);

		return NULL;
@@ -1937,10 +1937,10 @@ struct list_head *kiblnd_pool_alloc_node(struct kib_poolset *ps) 
	spin_unlock(&ps->ps_lock);



	CDEBUG(D_NET, "%s pool exhausted, allocate new pool\n", ps->ps_name);

	time_before = cfs_time_current();

	time_before = jiffies;

	rc = ps->ps_pool_create(ps, ps->ps_pool_size, &pool);

	CDEBUG(D_NET, "ps_pool_create took %lu HZ to complete",

	       cfs_time_current() - time_before);

	       jiffies - time_before);



	spin_lock(&ps->ps_lock);

	ps->ps_increasing = 0;

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c

+4 −4
Original line number Diff line number Diff line
@@ -1853,8 +1853,8 @@ kiblnd_thread_fini(void) 
static void

kiblnd_peer_alive(struct kib_peer *peer)

{

	/* This is racy, but everyone's only writing cfs_time_current() */

	peer->ibp_last_alive = cfs_time_current();

	/* This is racy, but everyone's only writing jiffies */

	peer->ibp_last_alive = jiffies;

	mb();

}
@@ -3206,7 +3206,7 @@ kiblnd_check_conns(int idx) 
			if (timedout) {

				CERROR("Timed out RDMA with %s (%lu): c: %u, oc: %u, rc: %u\n",

				       libcfs_nid2str(peer->ibp_nid),

				       cfs_duration_sec(cfs_time_current() -

				       cfs_duration_sec(jiffies -

							peer->ibp_last_alive),

				       conn->ibc_credits,

				       conn->ibc_outstanding_credits,
@@ -3681,7 +3681,7 @@ kiblnd_failover_thread(void *arg) 


		list_for_each_entry(dev, &kiblnd_data.kib_failed_devs,

				    ibd_fail_list) {

			if (time_before(cfs_time_current(),

			if (time_before(jiffies,

					dev->ibd_next_failover))

				continue;

			do_failover = 1;

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

+4 −5
Original line number Diff line number Diff line
@@ -1276,7 +1276,7 @@ ksocknal_create_conn(struct lnet_ni *ni, struct ksock_route *route, 
	}



	conn->ksnc_peer = peer;		 /* conn takes my ref on peer */

	peer->ksnp_last_alive = cfs_time_current();

	peer->ksnp_last_alive = jiffies;

	peer->ksnp_send_keepalive = 0;

	peer->ksnp_error = 0;
@@ -1284,7 +1284,7 @@ ksocknal_create_conn(struct lnet_ni *ni, struct ksock_route *route, 
	sched->kss_nconns++;

	conn->ksnc_scheduler = sched;



	conn->ksnc_tx_last_post = cfs_time_current();

	conn->ksnc_tx_last_post = jiffies;

	/* Set the deadline for the outgoing HELLO to drain */

	conn->ksnc_tx_bufnob = sock->sk->sk_wmem_queued;

	conn->ksnc_tx_deadline = cfs_time_shift(*ksocknal_tunables.ksnd_timeout);
@@ -1682,8 +1682,7 @@ ksocknal_destroy_conn(struct ksock_conn *conn) 
		       libcfs_id2str(conn->ksnc_peer->ksnp_id), conn->ksnc_type,

		       &conn->ksnc_ipaddr, conn->ksnc_port,

		       iov_iter_count(&conn->ksnc_rx_to), conn->ksnc_rx_nob_left,

		       cfs_duration_sec(cfs_time_sub(cfs_time_current(),

						     last_rcv)));

		       cfs_duration_sec(cfs_time_sub(jiffies, last_rcv)));

		lnet_finalize(conn->ksnc_peer->ksnp_ni,

			      conn->ksnc_cookie, -EIO);

		break;
@@ -1832,7 +1831,7 @@ ksocknal_query(struct lnet_ni *ni, lnet_nid_t nid, unsigned long *when) 
{

	int connect = 1;

	unsigned long last_alive = 0;

	unsigned long now = cfs_time_current();

	unsigned long now = jiffies;

	struct ksock_peer *peer = NULL;

	rwlock_t *glock = &ksocknal_data.ksnd_global_lock;

	struct lnet_process_id id = {