Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[~andy/linux] / fs / ocfs2 / stack_o2cb.c

diff --git a/fs/ocfs2/stack_o2cb.c b/fs/ocfs2/stack_o2cb.c
index 0d3049f696c5418448173ed3538020bd5d51b9d0..19965b00c43caee7df4e09428775a55150ba9f8c 100644 (file)
--- a/fs/ocfs2/stack_o2cb.c
+++ b/fs/ocfs2/stack_o2cb.c
@@ -283,6 +283,8 @@ static int o2cb_cluster_connect(struct ocfs2_cluster_connection *conn)
        /* for now we only have one cluster/node, make sure we see it
         * in the heartbeat universe */
        if (!o2hb_check_local_node_heartbeating()) {
+               if (o2hb_global_heartbeat_active())
+                       mlog(ML_ERROR, "Global heartbeat not started\n");
                rc = -EINVAL;
                goto out;
        }