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;
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
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
}
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);
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");
"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);
" 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");
/* 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);
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;
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;
}
}
int
kgnilnd_get_node_state(__u32 nid)
{
- return GNILND_RCA_NODE_UP;
+ return GNILND_PEER_UP;
}
#endif /* GNILND_USE_RCA */