Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b851095 authored by Ben Evans's avatar Ben Evans Committed by Greg Kroah-Hartman
Browse files

staging: lustre: lnet: Remove old commented out code 



These #if 0 blocks have been in place for years. Assume
they are not used and remove them

Signed-off-by: default avatarBen Evans <bevans@cray.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-8058
Reviewed-on: http://review.whamcloud.com/20414


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1e1f9ff4

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

+0 −5
Original line number Diff line number Diff line
@@ -1468,11 +1468,6 @@ ksocknal_close_conn_locked(struct ksock_conn *conn, int error) 


		conn->ksnc_route = NULL;



#if 0	   /* irrelevant with only eager routes */

		/* make route least favourite */

		list_del(&route->ksnr_list);

		list_add_tail(&route->ksnr_list, &peer->ksnp_routes);

#endif

		ksocknal_route_decref(route);     /* drop conn's ref on route */

	}

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

+0 −7
Original line number Diff line number Diff line
@@ -2008,13 +2008,6 @@ ksocknal_connect(struct ksock_route *route) 
		list_splice_init(&peer->ksnp_tx_queue, &zombies);

	}



#if 0	   /* irrelevant with only eager routes */

	if (!route->ksnr_deleted) {

		/* make this route least-favourite for re-selection */

		list_del(&route->ksnr_list);

		list_add_tail(&route->ksnr_list, &peer->ksnp_routes);

	}

#endif

	write_unlock_bh(&ksocknal_data.ksnd_global_lock);



	ksocknal_peer_failed(peer);

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

+1 −17
Original line number Diff line number Diff line
@@ -449,23 +449,7 @@ lnet_finalize(lnet_ni_t *ni, lnet_msg_t *msg, int status) 


	if (!msg)

		return;

#if 0

	CDEBUG(D_WARNING, "%s msg->%s Flags:%s%s%s%s%s%s%s%s%s%s%s txp %s rxp %s\n",

	       lnet_msgtyp2str(msg->msg_type), libcfs_id2str(msg->msg_target),

	       msg->msg_target_is_router ? "t" : "",

	       msg->msg_routing ? "X" : "",

	       msg->msg_ack ? "A" : "",

	       msg->msg_sending ? "S" : "",

	       msg->msg_receiving ? "R" : "",

	       msg->msg_delayed ? "d" : "",

	       msg->msg_txcredit ? "C" : "",

	       msg->msg_peertxcredit ? "c" : "",

	       msg->msg_rtrcredit ? "F" : "",

	       msg->msg_peerrtrcredit ? "f" : "",

	       msg->msg_onactivelist ? "!" : "",

	       !msg->msg_txpeer ? "<none>" : libcfs_nid2str(msg->msg_txpeer->lp_nid),

	       !msg->msg_rxpeer ? "<none>" : libcfs_nid2str(msg->msg_rxpeer->lp_nid));

#endif



	msg->msg_ev.status = status;



	if (msg->msg_md) {