|
@@ -543,8 +543,9 @@ static void o2net_set_nn_state(struct o2net_node *nn,
|
|
|
}
|
|
|
|
|
|
if (was_valid && !valid) {
|
|
|
- printk(KERN_NOTICE "o2net: No longer connected to "
|
|
|
- SC_NODEF_FMT "\n", SC_NODEF_ARGS(old_sc));
|
|
|
+ if (old_sc)
|
|
|
+ printk(KERN_NOTICE "o2net: No longer connected to "
|
|
|
+ SC_NODEF_FMT "\n", SC_NODEF_ARGS(old_sc));
|
|
|
o2net_complete_nodes_nsw(nn);
|
|
|
}
|
|
|
|
|
@@ -1695,13 +1696,12 @@ static void o2net_start_connect(struct work_struct *work)
|
|
|
ret = 0;
|
|
|
|
|
|
out:
|
|
|
- if (ret) {
|
|
|
+ if (ret && sc) {
|
|
|
printk(KERN_NOTICE "o2net: Connect attempt to " SC_NODEF_FMT
|
|
|
" failed with errno %d\n", SC_NODEF_ARGS(sc), ret);
|
|
|
/* 0 err so that another will be queued and attempted
|
|
|
* from set_nn_state */
|
|
|
- if (sc)
|
|
|
- o2net_ensure_shutdown(nn, sc, 0);
|
|
|
+ o2net_ensure_shutdown(nn, sc, 0);
|
|
|
}
|
|
|
if (sc)
|
|
|
sc_put(sc);
|