[Sheepdog] [PATCH 4/5] sheep: allow zone id to be zero

MORITA Kazutaka morita.kazutaka at lab.ntt.co.jp
Thu Sep 1 11:46:43 CEST 2011


Currently, the default zone id is the corosync node id, so zero is not
a special number.

Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
---
 sheep/group.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sheep/group.c b/sheep/group.c
index 34f42bc..1fcaea4 100644
--- a/sheep/group.c
+++ b/sheep/group.c
@@ -186,14 +186,12 @@ static void build_node_list(struct list_head *node_list,
 		nr++;
 
 		if (nr_zones && *nr_zones < ARRAY_SIZE(zones)) {
-			if (node->ent.zone != 0) {
-				for (i = 0; i < *nr_zones; i++) {
-					if (zones[i] == node->ent.zone)
-						break;
-				}
-				if (i == *nr_zones)
-					zones[(*nr_zones)++] = node->ent.zone;
+			for (i = 0; i < *nr_zones; i++) {
+				if (zones[i] == node->ent.zone)
+					break;
 			}
+			if (i == *nr_zones)
+				zones[(*nr_zones)++] = node->ent.zone;
 		}
 	}
 	if (entries)
-- 
1.7.2.5




More information about the sheepdog mailing list