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

staging: lustre: discard cfs_duration_sec() 



cfs_duration_sec() simply divides by HZ.
It is mostly used to report durations in debug messages.
Remove and just use X/HZ.

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 46357c56

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

+0 −5
Original line number Diff line number Diff line
@@ -60,11 +60,6 @@ 
 * Generic kernel stuff

 */



static inline long cfs_duration_sec(long d)

{

	return d / msecs_to_jiffies(MSEC_PER_SEC);

}



static inline int cfs_time_before_64(u64 t1, u64 t2)

{

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

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

+1 −1
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ static void kiblnd_query(struct lnet_ni *ni, lnet_nid_t nid, 


	CDEBUG(D_NET, "Peer %s %p, alive %ld secs ago\n",

	       libcfs_nid2str(nid), peer,

	       last_alive ? cfs_duration_sec(now - last_alive) : -1);

	       last_alive ? (now - last_alive) / HZ : -1);

}



static void kiblnd_free_pages(struct kib_pages *p)

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

+2 −3
Original line number Diff line number Diff line
@@ -3144,7 +3144,7 @@ kiblnd_check_txs_locked(struct kib_conn *conn, struct list_head *txs) 
		if (time_after_eq(jiffies, tx->tx_deadline)) {

			CERROR("Timed out tx: %s, %lu seconds\n",

			       kiblnd_queue2str(conn, txs),

			       cfs_duration_sec(jiffies - tx->tx_deadline));

			       (jiffies - tx->tx_deadline) / HZ);

			return 1;

		}

	}
@@ -3206,8 +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(jiffies -

							peer->ibp_last_alive),

				       (jiffies - peer->ibp_last_alive) / HZ,

				       conn->ibc_credits,

				       conn->ibc_outstanding_credits,

				       conn->ibc_reserved_credits);

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

+2 −2
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(jiffies - last_rcv));

		       (jiffies - last_rcv) / HZ);

		lnet_finalize(conn->ksnc_peer->ksnp_ni,

			      conn->ksnc_cookie, -EIO);

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


	CDEBUG(D_NET, "Peer %s %p, alive %ld secs ago, connect %d\n",

	       libcfs_nid2str(nid), peer,

	       last_alive ? cfs_duration_sec(now - last_alive) : -1,

	       last_alive ? (now - last_alive) / HZ : -1,

	       connect);



	if (!connect)

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

+2 −2
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ ksocknal_find_connectable_route_locked(struct ksock_peer *peer) 
			       &route->ksnr_ipaddr,

			       route->ksnr_connected,

			       route->ksnr_retry_interval,

			       cfs_duration_sec(route->ksnr_timeout - now));

			       (route->ksnr_timeout - now) / HZ);

			continue;

		}
@@ -2439,7 +2439,7 @@ ksocknal_check_peer_timeouts(int idx) 


		CERROR("Total %d stale ZC_REQs for peer %s detected; the oldest(%p) timed out %ld secs ago, resid: %d, wmem: %d\n",

		       n, libcfs_nid2str(peer->ksnp_id.nid), tx_stale,

		       cfs_duration_sec(jiffies - deadline),

		       (jiffies - deadline) / HZ,

		       resid, conn->ksnc_sock->sk->sk_wmem_queued);



		ksocknal_close_conn_and_siblings(conn, -ETIMEDOUT);