[Cluster-devel] [PATCH] qdisk: Assume 1 vote if not specified in cluster.conf

[Lon Hohberger]

This is a clean cherry-pick in to the RHEL6 branch.

Resolves: rhbz#663433

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 cman/qdisk/main.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index 78dc3f0..73138b2 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -1386,10 +1386,11 @@ auto_qdisk_votes(int desc)
 			"/cluster/clusternodes/clusternode[%d]/@votes", ret);
 
 		name = NULL;
-		if (ccs_get(desc, buf, &name) != 0)
-			break;
+		if (ccs_get(desc, buf, &name) == 0)
+			votes = atoi(name);
+		else
+			votes = 1;
 
-		votes=atoi(name);
 		if (votes != 1) {
 			free(name);
 
-- 
1.7.1.1