X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lnet%2Fklnds%2Fgnilnd%2Fgnilnd_stack.c;h=bdec6856fa75d55da3bcbb399ca7c62a84c1022d;hb=4ae5fa81f75e66f57f1cfcaae7b692e66285d79c;hp=1da0fbe90d68ff94b8d099b76c076b0313c8ba8d;hpb=f6995cf04407dff15d6ca79ca44cfa97dc6eb014;p=fs%2Flustre-release.git

diff --git a/lnet/klnds/gnilnd/gnilnd_stack.c b/lnet/klnds/gnilnd/gnilnd_stack.c
index 1da0fbe..bdec685 100644
--- a/lnet/klnds/gnilnd/gnilnd_stack.c
+++ b/lnet/klnds/gnilnd/gnilnd_stack.c
@@ -254,6 +254,9 @@ kgnilnd_reset_stack(void)
 
 			list_del_init(&conn->gnc_schedlist);
 
+			if (!list_empty(&conn->gnc_delaylist))
+				list_del_init(&conn->gnc_delaylist); 
+
 			if (conn->gnc_state == GNILND_CONN_CLOSING) {
 				/* bump to CLOSED to fake out send of CLOSE */
 				conn->gnc_state = GNILND_CONN_CLOSED;
@@ -535,7 +538,7 @@ kgnilnd_quiesce_end_callback(gni_nic_handle_t nic_handle, uint64_t msecs)
 
 	if (!kgnilnd_data.kgn_ruhroh_shutdown) {
 
-		CDEBUG(D_NET, "requesting timeout bump by "LPD64" msecs\n", msecs);
+		CDEBUG(D_NET, "requesting timeout bump by %lld msecs\n", msecs);
 
 		/* Save the bump interval and request the bump.
 		 * The memory barrier ensures that the interval is in place before
@@ -581,10 +584,9 @@ struct rcadata {
 	rs_event_code_t ec;
 };
 static struct rcadata rd[RCA_EVENTS] = {
-	{0, 0, ec_node_unavailable},
-	{0, 0, ec_node_available},
-	{0, 0, ec_node_failed}
-};
+	{ .ec = ec_node_unavailable },
+	{ .ec = ec_node_available },
+	{ .ec = ec_node_failed } };
 
 /* thread for receiving rca events */
 int
@@ -651,7 +653,7 @@ subscribe_retry:
 		}
 
 		if (krca_get_message(&rca_krt, &event) == 0) {
-			int node_down = GNILND_RCA_NODE_UNKNOWN;
+			int node_down = GNILND_PEER_UNKNOWN;
 			rs_state_t state;
 			LIST_HEAD(zombies);
 
@@ -675,7 +677,7 @@ subscribe_retry:
 			switch (event.ev_id) {
 			case ec_node_available:
 				CDEBUG(D_INFO, "ec_node_available\n");
-				node_down = GNILND_RCA_NODE_UP;
+				node_down = GNILND_PEER_UP;
 				break;
 			case ec_node_failed:
 				CDEBUG(D_INFO, "ec_node_failed\n");
@@ -684,7 +686,7 @@ subscribe_retry:
 						"ec_node_failed ignored\n");
 					break;
 				}
-				node_down = GNILND_RCA_NODE_DOWN;
+				node_down = GNILND_PEER_DOWN;
 				break;
 			case ec_node_unavailable:
 				state = RSN_GET_FLD(event.ev_gen.svid_node.rsn_intval, STATE);
@@ -701,7 +703,7 @@ subscribe_retry:
 						" RS_CS_READY state\n");
 					break;
 				}
-				node_down = GNILND_RCA_NODE_DOWN;
+				node_down = GNILND_PEER_DOWN;
 				break;
 			default:
 				CDEBUG(D_INFO, "unknown event\n");
@@ -710,9 +712,8 @@ subscribe_retry:
 
 			/* if we get an event we don't know about, just go ahead
 			 * and wait for another event */
-			if (node_down == GNILND_RCA_NODE_UNKNOWN) {
+			if (node_down == GNILND_PEER_UNKNOWN)
 				continue;
-			}
 
 			nid = RSN_GET_FLD(event.ev_gen.svid_node.rs_node_flat,
 					  NID);
@@ -768,7 +769,7 @@ int
 kgnilnd_get_node_state(__u32 nid)
 {
 	int i;
-	int rc = GNILND_RCA_NODE_UNKNOWN;
+	int rc = GNILND_PEER_UNKNOWN;
 	int ret;
 	rs_node_array_t nlist;
 	rs_node_t       *na = NULL;
@@ -783,7 +784,7 @@ kgnilnd_get_node_state(__u32 nid)
 	for (i = 0; i < nlist.na_len; i++) {
 		if ((rca_nid_t)RSN_GET_FLD(na[i].rs_node_flat, NID) == nid) {
 			rc = RSN_GET_FLD(na[i].rs_node_flat, STATE) == RS_CS_READY ?
-				GNILND_RCA_NODE_UP : GNILND_RCA_NODE_DOWN;
+				GNILND_PEER_UP : GNILND_PEER_DOWN;
 			break;
 		}
 	}
@@ -810,6 +811,6 @@ kgnilnd_wakeup_rca_thread(void)
 int
 kgnilnd_get_node_state(__u32 nid)
 {
-	return GNILND_RCA_NODE_UP;
+	return GNILND_PEER_UP;
 }
 #endif /* GNILND_USE_RCA */