From: Martin Schwenke <martin@meltin.net>
Date: Mon, 23 May 2016 04:50:14 +0000 (+1000)
Subject: ctdb-ipalloc: Do not use node count or PNNs from CTDB context
X-Git-Tag: tdb-1.3.10~552
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ec7de66e9680864147b232d797c627b4a7da63f;p=thirdparty%2Fsamba.git

ctdb-ipalloc: Do not use node count or PNNs from CTDB context

This is unnecessary.  IP allocation state already has a node count and
"i" is already a PNN.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 41beffc3016..bb548910dd0 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -1245,7 +1245,7 @@ create_merged_ip_list(struct ctdb_context *ctdb, struct ipalloc_state *ipalloc_s
 		return NULL;
 	}
 
-	for (i=0; i < ctdb->num_nodes; i++) {
+	for (i=0; i < ipalloc_state->num; i++) {
 
 		public_ips = &ipalloc_state->known_public_ips[i];
 
@@ -1256,7 +1256,7 @@ create_merged_ip_list(struct ctdb_context *ctdb, struct ipalloc_state *ipalloc_s
 			CTDB_NO_MEMORY_NULL(ctdb, tmp_ip);
 			/* Do not use information about IP addresses hosted
 			 * on other nodes, it may not be accurate */
-			if (public_ips->ip[j].pnn == ctdb->nodes[i]->pnn) {
+			if (public_ips->ip[j].pnn == i) {
 				tmp_ip->pnn = public_ips->ip[j].pnn;
 			} else {
 				tmp_ip->pnn = -1;