From 5bedf1d56c981d57ab0bda748cd9537521368d47 Mon Sep 17 00:00:00 2001 From: Sunil Mushran Date: Wed, 6 Oct 2010 17:55:29 -0700 Subject: [PATCH] --- yaml --- r: 212785 b: refs/heads/master c: 5f3c6d9c615770708df464c170316f83cf437242 h: refs/heads/master i: 212783: 4360815918c6aff2789fca813c13ca5dbb3c90b0 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/stack_o2cb.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6439fd6298dc..b73dae4f52dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea2034416b54700e30371f2ad6517cbb94674083 +refs/heads/master: 5f3c6d9c615770708df464c170316f83cf437242 diff --git a/trunk/fs/ocfs2/stack_o2cb.c b/trunk/fs/ocfs2/stack_o2cb.c index 0d3049f696c5..19965b00c43c 100644 --- a/trunk/fs/ocfs2/stack_o2cb.c +++ b/trunk/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; }