1 files changed, 32 insertions, 28 deletions

diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index d644dc611425..2cd2406b4140 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -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);
         }
 
@@ -765,32 +766,32 @@ static struct o2net_msg_handler *
 o2net_handler_tree_lookup(u32 msg_type, u32 key, struct rb_node ***ret_p,
                           struct rb_node **ret_parent)
 {
-        struct rb_node **p = &o2net_handler_tree.rb_node;
-        struct rb_node *parent = NULL;
+        struct rb_node **p = &o2net_handler_tree.rb_node;
+        struct rb_node *parent = NULL;
         struct o2net_msg_handler *nmh, *ret = NULL;
         int cmp;
 
-        while (*p) {
-                parent = *p;
-                nmh = rb_entry(parent, struct o2net_msg_handler, nh_node);
+        while (*p) {
+                parent = *p;
+                nmh = rb_entry(parent, struct o2net_msg_handler, nh_node);
                 cmp = o2net_handler_cmp(nmh, msg_type, key);
 
-                if (cmp < 0)
-                        p = &(*p)->rb_left;
-                else if (cmp > 0)
-                        p = &(*p)->rb_right;
-                else {
+                if (cmp < 0)
+                        p = &(*p)->rb_left;
+                else if (cmp > 0)
+                        p = &(*p)->rb_right;
+                else {
                         ret = nmh;
-                        break;
+                        break;
                 }
-        }
+        }
 
-        if (ret_p != NULL)
-                *ret_p = p;
-        if (ret_parent != NULL)
-                *ret_parent = parent;
+        if (ret_p != NULL)
+                *ret_p = p;
+        if (ret_parent != NULL)
+                *ret_parent = parent;
 
-        return ret;
+        return ret;
 }
 
 static void o2net_handler_kref_release(struct kref *kref)
@@ -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);
@@ -1873,12 +1873,16 @@ static int o2net_accept_one(struct socket *sock)
 
         if (o2nm_this_node() >= node->nd_num) {
                 local_node = o2nm_get_node_by_num(o2nm_this_node());
-                printk(KERN_NOTICE "o2net: Unexpected connect attempt seen "
-                       "at node '%s' (%u, %pI4:%d) from node '%s' (%u, "
-                       "%pI4:%d)\n", local_node->nd_name, local_node->nd_num,
-                       &(local_node->nd_ipv4_address),
-                       ntohs(local_node->nd_ipv4_port), node->nd_name,
-                       node->nd_num, &sin.sin_addr.s_addr, ntohs(sin.sin_port));
+                if (local_node)
+                        printk(KERN_NOTICE "o2net: Unexpected connect attempt "
+                                        "seen at node '%s' (%u, %pI4:%d) from "
+                                        "node '%s' (%u, %pI4:%d)\n",
+                                        local_node->nd_name, local_node->nd_num,
+                                        &(local_node->nd_ipv4_address),
+                                        ntohs(local_node->nd_ipv4_port),
+                                        node->nd_name,
+                                        node->nd_num, &sin.sin_addr.s_addr,
+                                        ntohs(sin.sin_port));
                 ret = -EINVAL;
                 goto out;
         }