Commit d3d3d37a authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: don't set more than one variable per line in LNet layer 



Cleanup all occurances of more than one variable being set per line as
reported by checkpatch.pl.

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 51078e25

drivers/staging/lustre/include/linux/lnet/lib-lnet.h

+2 −1
Original line number Diff line number Diff line
@@ -681,7 +681,8 @@ void lnet_debug_peer(lnet_nid_t nid); 
static inline void

lnet_peer_set_alive(lnet_peer_t *lp)

{

	lp->lp_last_alive = lp->lp_last_query = jiffies;

	lp->lp_last_query = jiffies;

	lp->lp_last_alive = jiffies;

	if (!lp->lp_alive)

		lnet_notify_locked(lp, 0, 1, lp->lp_last_alive);

}

drivers/staging/lustre/include/linux/lnet/socklnd.h

+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ socklnd_init_msg(ksock_msg_t *msg, int type) 
{

	msg->ksm_csum = 0;

	msg->ksm_type = type;

	msg->ksm_zc_cookies[0] = msg->ksm_zc_cookies[1]  = 0;

	msg->ksm_zc_cookies[0] = 0;

	msg->ksm_zc_cookies[1] = 0;

}



#define KSOCK_MSG_NOOP	0xC0	/* ksm_u empty */

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

+6 −4
Original line number Diff line number Diff line
@@ -500,7 +500,8 @@ static int kiblnd_del_peer(lnet_ni_t *ni, lnet_nid_t nid) 
	write_lock_irqsave(&kiblnd_data.kib_global_lock, flags);



	if (nid != LNET_NID_ANY) {

		lo = hi = kiblnd_nid2peerlist(nid) - kiblnd_data.kib_peers;

		lo = kiblnd_nid2peerlist(nid) - kiblnd_data.kib_peers;

		hi = kiblnd_nid2peerlist(nid) - kiblnd_data.kib_peers;

	} else {

		lo = 0;

		hi = kiblnd_data.kib_peer_hash_size - 1;
@@ -979,9 +980,10 @@ static int kiblnd_close_matching_conns(lnet_ni_t *ni, lnet_nid_t nid) 


	write_lock_irqsave(&kiblnd_data.kib_global_lock, flags);



	if (nid != LNET_NID_ANY)

		lo = hi = kiblnd_nid2peerlist(nid) - kiblnd_data.kib_peers;

	else {

	if (nid != LNET_NID_ANY) {

		lo = kiblnd_nid2peerlist(nid) - kiblnd_data.kib_peers;

		hi = kiblnd_nid2peerlist(nid) - kiblnd_data.kib_peers;

	} else {

		lo = 0;

		hi = kiblnd_data.kib_peer_hash_size - 1;

	}

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

+2 −4
Original line number Diff line number Diff line
@@ -1061,8 +1061,8 @@ kiblnd_init_rdma(kib_conn_t *conn, kib_tx_t *tx, int type, 
	struct ib_sge *sge = &tx->tx_sge[0];

	struct ib_rdma_wr *wrq = &tx->tx_wrq[0], *next;

	int rc  = resid;

	int srcidx;

	int dstidx;

	int srcidx = 0;

	int dstidx = 0;

	int wrknob;



	LASSERT(!in_interrupt());
@@ -1070,8 +1070,6 @@ kiblnd_init_rdma(kib_conn_t *conn, kib_tx_t *tx, int type, 
	LASSERT(type == IBLND_MSG_GET_DONE ||

		type == IBLND_MSG_PUT_DONE);



	srcidx = dstidx = 0;



	while (resid > 0) {

		if (srcidx >= srcrd->rd_nfrags) {

			CERROR("Src buffer exhausted: %d frags\n", srcidx);

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

+10 −7
Original line number Diff line number Diff line
@@ -582,9 +582,10 @@ ksocknal_del_peer(lnet_ni_t *ni, lnet_process_id_t id, __u32 ip) 


	write_lock_bh(&ksocknal_data.ksnd_global_lock);



	if (id.nid != LNET_NID_ANY)

		lo = hi = (int)(ksocknal_nid2peerlist(id.nid) - ksocknal_data.ksnd_peers);

	else {

	if (id.nid != LNET_NID_ANY) {

		lo = (int)(ksocknal_nid2peerlist(id.nid) - ksocknal_data.ksnd_peers);

		hi = (int)(ksocknal_nid2peerlist(id.nid) - ksocknal_data.ksnd_peers);

	} else {

		lo = 0;

		hi = ksocknal_data.ksnd_peer_hash_size - 1;

	}
@@ -1774,9 +1775,10 @@ ksocknal_close_matching_conns(lnet_process_id_t id, __u32 ipaddr) 


	write_lock_bh(&ksocknal_data.ksnd_global_lock);



	if (id.nid != LNET_NID_ANY)

		lo = hi = (int)(ksocknal_nid2peerlist(id.nid) - ksocknal_data.ksnd_peers);

	else {

	if (id.nid != LNET_NID_ANY) {

		lo = (int)(ksocknal_nid2peerlist(id.nid) - ksocknal_data.ksnd_peers);

		hi = (int)(ksocknal_nid2peerlist(id.nid) - ksocknal_data.ksnd_peers);

	} else {

		lo = 0;

		hi = ksocknal_data.ksnd_peer_hash_size - 1;

	}
@@ -1938,7 +1940,8 @@ static int ksocknal_push(lnet_ni_t *ni, lnet_process_id_t id) 
		start = &ksocknal_data.ksnd_peers[0];

		end = &ksocknal_data.ksnd_peers[hsize - 1];

	} else {

		start = end = ksocknal_nid2peerlist(id.nid);

		start = ksocknal_nid2peerlist(id.nid);

		end = ksocknal_nid2peerlist(id.nid);

	}



	for (tmp = start; tmp <= end; tmp++) {