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

staging: lustre: align all code properly for LNet core 



In several places in the LNet core the code doesn't align
up properly. This resolves those checkpath issues.

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

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

+23 −26
Original line number Diff line number Diff line
@@ -1581,8 +1581,7 @@ int kiblnd_fmr_pool_map(kib_fmr_poolset_t *fps, __u64 *pages, int npages, 


	if (fps->fps_increasing) {

		spin_unlock(&fps->fps_lock);

		CDEBUG(D_NET,

			"Another thread is allocating new FMR pool, waiting for her to complete\n");

		CDEBUG(D_NET, "Another thread is allocating new FMR pool, waiting for her to complete\n");

		schedule();

		goto again;
@@ -2252,8 +2251,7 @@ int kiblnd_dev_failover(kib_dev_t *dev) 
	int i;



	LASSERT(*kiblnd_tunables.kib_dev_failover > 1 ||

		 dev->ibd_can_failover ||

		 dev->ibd_hdev == NULL);

		dev->ibd_can_failover || dev->ibd_hdev == NULL);



	rc = kiblnd_dev_need_failover(dev);

	if (rc <= 0)
@@ -2432,8 +2430,7 @@ static kib_dev_t *kiblnd_create_dev(char *ifname) 
		return NULL;

	}



	list_add_tail(&dev->ibd_list,

			  &kiblnd_data.kib_devs);

	list_add_tail(&dev->ibd_list, &kiblnd_data.kib_devs);

	return dev;

}

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

+44 −47
Original line number Diff line number Diff line
@@ -1944,8 +1944,7 @@ kiblnd_abort_txs(kib_conn_t *conn, struct list_head *txs) 


		if (txs == &conn->ibc_active_txs) {

			LASSERT(!tx->tx_queued);

			LASSERT(tx->tx_waiting ||

				 tx->tx_sending != 0);

			LASSERT(tx->tx_waiting || tx->tx_sending != 0);

		} else {

			LASSERT(tx->tx_queued);

		}
@@ -3061,8 +3060,7 @@ kiblnd_check_conns(int idx) 
				       conn->ibc_reserved_credits);

				list_add(&conn->ibc_connd_list, &closes);

			} else {

				list_add(&conn->ibc_connd_list,

					     &checksends);

				list_add(&conn->ibc_connd_list, &checksends);

			}

			/* +ref for 'closes' or 'checksends' */

			kiblnd_conn_addref(conn);
@@ -3090,8 +3088,7 @@ kiblnd_check_conns(int idx) 
	 * free to do it last time...

	 */

	while (!list_empty(&checksends)) {

		conn = list_entry(checksends.next,

				      kib_conn_t, ibc_connd_list);

		conn = list_entry(checksends.next, kib_conn_t, ibc_connd_list);

		list_del(&conn->ibc_connd_list);

		kiblnd_check_sends(conn);

		kiblnd_conn_decref(conn);
@@ -3350,8 +3347,8 @@ kiblnd_scheduler(void *arg) 
		did_something = 0;



		if (!list_empty(&sched->ibs_conns)) {

			conn = list_entry(sched->ibs_conns.next,

					      kib_conn_t, ibc_sched_list);

			conn = list_entry(sched->ibs_conns.next, kib_conn_t,

					  ibc_sched_list);

			/* take over kib_sched_conns' ref on conn... */

			LASSERT(conn->ibc_scheduled);

			list_del(&conn->ibc_sched_list);

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

+38 −42
Original line number Diff line number Diff line
@@ -592,8 +592,7 @@ ksocknal_del_peer(lnet_ni_t *ni, lnet_process_id_t id, __u32 ip) 
	}



	for (i = lo; i <= hi; i++) {

		list_for_each_safe(ptmp, pnxt,

					&ksocknal_data.ksnd_peers[i]) {

		list_for_each_safe(ptmp, pnxt, &ksocknal_data.ksnd_peers[i]) {

			peer = list_entry(ptmp, ksock_peer_t, ksnp_list);



			if (peer->ksnp_ni != ni)
@@ -2022,8 +2021,7 @@ ksocknal_add_interface(lnet_ni_t *ni, __u32 ipaddress, __u32 netmask) 
						iface->ksni_npeers++;



				list_for_each(rtmp, &peer->ksnp_routes) {

					route = list_entry(rtmp,

							       ksock_route_t,

					route = list_entry(rtmp, ksock_route_t,

							   ksnr_list);



					if (route->ksnr_myipaddr == ipaddress)
@@ -2114,8 +2112,7 @@ ksocknal_del_interface(lnet_ni_t *ni, __u32 ipaddress) 
		for (j = 0; j < ksocknal_data.ksnd_peer_hash_size; j++) {

			list_for_each_safe(tmp, nxt,

					   &ksocknal_data.ksnd_peers[j]) {

				peer = list_entry(tmp, ksock_peer_t,

						      ksnp_list);

				peer = list_entry(tmp, ksock_peer_t, ksnp_list);



				if (peer->ksnp_ni != ni)

					continue;
@@ -2712,8 +2709,7 @@ ksocknal_search_new_ipif(ksock_net_t *net) 
		if (colon != NULL) /* ignore alias device */

			*colon = 0;



		list_for_each_entry(tmp, &ksocknal_data.ksnd_nets,

					ksnn_list) {

		list_for_each_entry(tmp, &ksocknal_data.ksnd_nets, ksnn_list) {

			for (j = 0; !found && j < tmp->ksnn_ninterfaces; j++) {

				char *ifnam2 =

					&tmp->ksnn_interfaces[j].ksni_name[0];

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

+32 −41
Original line number Diff line number Diff line
@@ -709,8 +709,7 @@ ksocknal_queue_tx_locked (ksock_tx_t *tx, ksock_conn_t *conn) 


	CDEBUG(D_NET, "Sending to %s ip %pI4h:%d\n",

	       libcfs_id2str(conn->ksnc_peer->ksnp_id),

		&conn->ksnc_ipaddr,

		conn->ksnc_port);

	       &conn->ksnc_ipaddr, conn->ksnc_port);



	ksocknal_tx_prep(conn, tx);
@@ -782,8 +781,7 @@ ksocknal_queue_tx_locked (ksock_tx_t *tx, ksock_conn_t *conn) 
	    !conn->ksnc_tx_scheduled) { /* not scheduled to send */

		/* +1 ref for scheduler */

		ksocknal_conn_addref(conn);

		list_add_tail (&conn->ksnc_tx_list,

				   &sched->kss_tx_conns);

		list_add_tail(&conn->ksnc_tx_list, &sched->kss_tx_conns);

		conn->ksnc_tx_scheduled = 1;

		wake_up (&sched->kss_waitq);

	}
@@ -1483,8 +1481,7 @@ int ksocknal_scheduler(void *arg) 
			LIST_HEAD(zlist);



			if (!list_empty(&sched->kss_zombie_noop_txs)) {

				list_add(&zlist,

					     &sched->kss_zombie_noop_txs);

				list_add(&zlist, &sched->kss_zombie_noop_txs);

				list_del_init(&sched->kss_zombie_noop_txs);

			}
@@ -1527,8 +1524,7 @@ int ksocknal_scheduler(void *arg) 
			if (rc == -ENOMEM || rc == -EAGAIN) {

				/* Incomplete send: replace tx on HEAD of tx_queue */

				spin_lock_bh(&sched->kss_lock);

				list_add(&tx->tx_list,

					     &conn->ksnc_tx_queue);

				list_add(&tx->tx_list, &conn->ksnc_tx_queue);

			} else {

				/* Complete send; tx -ref */

				ksocknal_tx_decref(tx);
@@ -1595,8 +1591,7 @@ void ksocknal_read_callback (ksock_conn_t *conn) 
	conn->ksnc_rx_ready = 1;



	if (!conn->ksnc_rx_scheduled) {  /* not being progressed */

		list_add_tail(&conn->ksnc_rx_list,

				  &sched->kss_rx_conns);

		list_add_tail(&conn->ksnc_rx_list, &sched->kss_rx_conns);

		conn->ksnc_rx_scheduled = 1;

		/* extra ref for scheduler */

		ksocknal_conn_addref(conn);
@@ -1622,8 +1617,7 @@ void ksocknal_write_callback (ksock_conn_t *conn) 


	if (!conn->ksnc_tx_scheduled && /* not being progressed */

	    !list_empty(&conn->ksnc_tx_queue)) { /* packets to send */

		list_add_tail (&conn->ksnc_tx_list,

				   &sched->kss_tx_conns);

		list_add_tail(&conn->ksnc_tx_list, &sched->kss_tx_conns);

		conn->ksnc_tx_scheduled = 1;

		/* extra ref for scheduler */

		ksocknal_conn_addref(conn);
@@ -1850,8 +1844,7 @@ ksocknal_recv_hello (lnet_ni_t *ni, ksock_conn_t *conn, 
	if (ksocknal_invert_type(hello->kshm_ctype) != conn->ksnc_type) {

		CERROR("Mismatched types: me %d, %s ip %pI4h %d\n",

		       conn->ksnc_type, libcfs_id2str(*peerid),

			&conn->ksnc_ipaddr,

			hello->kshm_ctype);

		       &conn->ksnc_ipaddr, hello->kshm_ctype);

		return -EPROTO;

	}
@@ -2372,8 +2365,7 @@ ksocknal_flush_stale_txs(ksock_peer_t *peer) 
	write_lock_bh(&ksocknal_data.ksnd_global_lock);



	while (!list_empty (&peer->ksnp_tx_queue)) {

		tx = list_entry (peer->ksnp_tx_queue.next,

				     ksock_tx_t, tx_list);

		tx = list_entry(peer->ksnp_tx_queue.next, ksock_tx_t, tx_list);



		if (!cfs_time_aftereq(cfs_time_current(),

				      tx->tx_deadline))
@@ -2498,8 +2490,7 @@ ksocknal_check_peer_timeouts (int idx) 
		 * holding only shared lock

		 */

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

			ksock_tx_t *tx =

				list_entry (peer->ksnp_tx_queue.next,

			ksock_tx_t *tx = list_entry(peer->ksnp_tx_queue.next,

						    ksock_tx_t, tx_list);



			if (cfs_time_aftereq(cfs_time_current(),
@@ -2618,8 +2609,8 @@ ksocknal_reaper (void *arg) 
		/* reschedule all the connections that stalled with ENOMEM... */

		nenomem_conns = 0;

		while (!list_empty (&enomem_conns)) {

			conn = list_entry (enomem_conns.next,

					       ksock_conn_t, ksnc_tx_list);

			conn = list_entry(enomem_conns.next, ksock_conn_t,

					  ksnc_tx_list);

			list_del (&conn->ksnc_tx_list);



			sched = conn->ksnc_scheduler;

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

+23 −23
Original line number Diff line number Diff line
@@ -198,8 +198,8 @@ ksocknal_lib_eager_ack(ksock_conn_t *conn) 
	 * on, introducing delay in completing zero-copy sends in my

	 * peer.

	 */

	kernel_setsockopt(sock, SOL_TCP, TCP_QUICKACK,

			       (char *)&opt, sizeof(opt));

	kernel_setsockopt(sock, SOL_TCP, TCP_QUICKACK, (char *)&opt,

			  sizeof(opt));

}



int
@@ -236,8 +236,8 @@ ksocknal_lib_recv_iov(ksock_conn_t *conn) 
	}

	LASSERT(nob <= conn->ksnc_rx_nob_wanted);



	rc = kernel_recvmsg(conn->ksnc_sock, &msg,

		scratchiov, niov, nob, MSG_DONTWAIT);

	rc = kernel_recvmsg(conn->ksnc_sock, &msg, scratchiov, niov, nob,

			    MSG_DONTWAIT);



	saved_csum = 0;

	if (conn->ksnc_proto == &ksocknal_protocol_v2x) {
@@ -357,8 +357,8 @@ ksocknal_lib_recv_kiov(ksock_conn_t *conn) 


	LASSERT(nob <= conn->ksnc_rx_nob_wanted);



	rc = kernel_recvmsg(conn->ksnc_sock, &msg,

			(struct kvec *)scratchiov, n, nob, MSG_DONTWAIT);

	rc = kernel_recvmsg(conn->ksnc_sock, &msg, (struct kvec *)scratchiov,

			    n, nob, MSG_DONTWAIT);



	if (conn->ksnc_msg.ksm_csum != 0) {

		for (i = 0, sum = rc; sum > 0; i++, sum -= fragnob) {
@@ -482,16 +482,16 @@ ksocknal_lib_setup_sock(struct socket *sock) 
	linger.l_onoff = 0;

	linger.l_linger = 0;



	rc = kernel_setsockopt(sock, SOL_SOCKET, SO_LINGER,

			      (char *)&linger, sizeof(linger));

	rc = kernel_setsockopt(sock, SOL_SOCKET, SO_LINGER, (char *)&linger,

			       sizeof(linger));

	if (rc != 0) {

		CERROR("Can't set SO_LINGER: %d\n", rc);

		return rc;

	}



	option = -1;

	rc = kernel_setsockopt(sock, SOL_TCP, TCP_LINGER2,

				    (char *)&option, sizeof(option));

	rc = kernel_setsockopt(sock, SOL_TCP, TCP_LINGER2, (char *)&option,

			       sizeof(option));

	if (rc != 0) {

		CERROR("Can't set SO_LINGER2: %d\n", rc);

		return rc;
@@ -527,8 +527,8 @@ ksocknal_lib_setup_sock(struct socket *sock) 
	do_keepalive = (keep_idle > 0 && keep_count > 0 && keep_intvl > 0);



	option = (do_keepalive ? 1 : 0);

	rc = kernel_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,

			      (char *)&option, sizeof(option));

	rc = kernel_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (char *)&option,

			       sizeof(option));

	if (rc != 0) {

		CERROR("Can't set SO_KEEPALIVE: %d\n", rc);

		return rc;
@@ -537,8 +537,8 @@ ksocknal_lib_setup_sock(struct socket *sock) 
	if (!do_keepalive)

		return 0;



	rc = kernel_setsockopt(sock, SOL_TCP, TCP_KEEPIDLE,

				    (char *)&keep_idle, sizeof(keep_idle));

	rc = kernel_setsockopt(sock, SOL_TCP, TCP_KEEPIDLE, (char *)&keep_idle,

			       sizeof(keep_idle));

	if (rc != 0) {

		CERROR("Can't set TCP_KEEPIDLE: %d\n", rc);

		return rc;
@@ -551,8 +551,8 @@ ksocknal_lib_setup_sock(struct socket *sock) 
		return rc;

	}



	rc = kernel_setsockopt(sock, SOL_TCP, TCP_KEEPCNT,

				    (char *)&keep_count, sizeof(keep_count));

	rc = kernel_setsockopt(sock, SOL_TCP, TCP_KEEPCNT, (char *)&keep_count,

			       sizeof(keep_count));

	if (rc != 0) {

		CERROR("Can't set TCP_KEEPCNT: %d\n", rc);

		return rc;