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

staging: lustre: libcfs: discard cfs_time_add/sub 



cfs_time_add adds its arguments.
cfs_time_sub subtracts finds the difference.
Discard these and use '+' and '-' directly.

This change highlighted a type error.  The structure field
cr_queued_time was used to store jiffies, but was declared
as time_t (meant for seconds).  So the time is changed to
"unsigned long".

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 4671dc9f

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

+1 −11
Original line number Diff line number Diff line
@@ -40,16 +40,6 @@ 
 * generic time manipulation functions.

 */



static inline unsigned long cfs_time_add(unsigned long t, long d)

{

	return (unsigned long)(t + d);

}



static inline unsigned long cfs_time_sub(unsigned long t1, unsigned long t2)

{

	return (unsigned long)(t1 - t2);

}



static inline int cfs_time_after(unsigned long t1, unsigned long t2)

{

	return time_before(t2, t1);
@@ -62,7 +52,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(jiffies, seconds * HZ);

	return jiffies + seconds * HZ;

}



/*

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

+1 −7
Original line number Diff line number Diff line
@@ -65,15 +65,9 @@ static inline long cfs_duration_sec(long d) 
	return d / msecs_to_jiffies(MSEC_PER_SEC);

}



static inline u64 cfs_time_add_64(u64 t, u64 d)

{

	return t + d;

}



static inline u64 cfs_time_shift_64(int seconds)

{

	return cfs_time_add_64(get_jiffies_64(),

			       seconds * HZ);

	return get_jiffies_64() + (u64)seconds * HZ;

}



static inline int cfs_time_before_64(u64 t1, u64 t2)

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

+1 −1
Original line number Diff line number Diff line
@@ -1682,7 +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(jiffies, last_rcv)));

		       cfs_duration_sec(jiffies - last_rcv));

		lnet_finalize(conn->ksnc_peer->ksnp_ni,

			      conn->ksnc_cookie, -EIO);

		break;

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

+8 −15
Original line number Diff line number Diff line
@@ -481,8 +481,7 @@ ksocknal_process_transmit(struct ksock_conn *conn, struct ksock_tx *tx) 
		LASSERT(conn->ksnc_tx_scheduled);

		list_add_tail(&conn->ksnc_tx_list,

			      &ksocknal_data.ksnd_enomem_conns);

		if (!cfs_time_aftereq(cfs_time_add(jiffies,

						   SOCKNAL_ENOMEM_RETRY),

		if (!cfs_time_aftereq(jiffies + SOCKNAL_ENOMEM_RETRY,

				   ksocknal_data.ksnd_reaper_waketime))

			wake_up(&ksocknal_data.ksnd_reaper_waitq);
@@ -1777,8 +1776,7 @@ ksocknal_connect(struct ksock_route *route) 
	int retry_later = 0;

	int rc = 0;



	deadline = cfs_time_add(jiffies,

				*ksocknal_tunables.ksnd_timeout * HZ);

	deadline = jiffies + *ksocknal_tunables.ksnd_timeout * HZ;



	write_lock_bh(&ksocknal_data.ksnd_global_lock);
@@ -1877,8 +1875,7 @@ ksocknal_connect(struct ksock_route *route) 
			 */

			route->ksnr_retry_interval =

				*ksocknal_tunables.ksnd_min_reconnectms * HZ / 1000;

			route->ksnr_timeout = cfs_time_add(jiffies,

							   route->ksnr_retry_interval);

			route->ksnr_timeout = jiffies + route->ksnr_retry_interval;

		}



		ksocknal_launch_connection_locked(route);
@@ -1903,8 +1900,7 @@ ksocknal_connect(struct ksock_route *route) 
		    (long)*ksocknal_tunables.ksnd_max_reconnectms * HZ / 1000);



	LASSERT(route->ksnr_retry_interval);

	route->ksnr_timeout = cfs_time_add(jiffies,

					   route->ksnr_retry_interval);

	route->ksnr_timeout = jiffies + route->ksnr_retry_interval;



	if (!list_empty(&peer->ksnp_tx_queue) &&

	    !peer->ksnp_accepting &&
@@ -2302,8 +2298,7 @@ ksocknal_send_keepalive_locked(struct ksock_peer *peer) 


	if (*ksocknal_tunables.ksnd_keepalive <= 0 ||

	    time_before(jiffies,

			cfs_time_add(peer->ksnp_last_alive,

				     *ksocknal_tunables.ksnd_keepalive * HZ)))

			peer->ksnp_last_alive + *ksocknal_tunables.ksnd_keepalive * HZ))

		return 0;



	if (time_before(jiffies, peer->ksnp_send_keepalive))
@@ -2531,8 +2526,7 @@ ksocknal_reaper(void *arg) 
		}



		/* careful with the jiffy wrap... */

		while ((timeout = cfs_time_sub(deadline,

					       jiffies)) <= 0) {

		while ((timeout = deadline - jiffies) <= 0) {

			const int n = 4;

			const int p = 1;

			int chunk = ksocknal_data.ksnd_peer_hash_size;
@@ -2557,7 +2551,7 @@ ksocknal_reaper(void *arg) 
					     ksocknal_data.ksnd_peer_hash_size;

			}



			deadline = cfs_time_add(deadline, p * HZ);

			deadline = deadline + p * HZ;

		}



		if (nenomem_conns) {
@@ -2568,8 +2562,7 @@ ksocknal_reaper(void *arg) 
			 */

			timeout = SOCKNAL_ENOMEM_RETRY;

		}

		ksocknal_data.ksnd_reaper_waketime =

			cfs_time_add(jiffies, timeout);

		ksocknal_data.ksnd_reaper_waketime = jiffies + timeout;



		set_current_state(TASK_INTERRUPTIBLE);

		add_wait_queue(&ksocknal_data.ksnd_reaper_waitq, &wait);

drivers/staging/lustre/lnet/lnet/lib-move.c

+2 −4
Original line number Diff line number Diff line
@@ -523,8 +523,7 @@ lnet_peer_is_alive(struct lnet_peer *lp, unsigned long now) 
	    cfs_time_aftereq(lp->lp_timestamp, lp->lp_last_alive))

		return 0;



	deadline = cfs_time_add(lp->lp_last_alive,

				lp->lp_ni->ni_peertimeout * HZ);

	deadline = lp->lp_last_alive + lp->lp_ni->ni_peertimeout * HZ;

	alive = cfs_time_after(deadline, now);



	/* Update obsolete lp_alive except for routers assumed to be dead
@@ -561,8 +560,7 @@ lnet_peer_alive_locked(struct lnet_peer *lp) 
		static const int lnet_queryinterval = 1;



		unsigned long next_query =

			   cfs_time_add(lp->lp_last_query,

					lnet_queryinterval * HZ);

			   lp->lp_last_query + lnet_queryinterval * HZ;



		if (time_before(now, next_query)) {

			if (lp->lp_alive)