From: Martin Schwenke <martin@meltin.net>
Date: Mon, 23 May 2016 04:46:18 +0000 (+1000)
Subject: ctdb-ipalloc: Drop an unnecessary check
X-Git-Tag: tdb-1.3.10~553
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c92aa6105a7854782a61ba4bdcc63d179aafd42f;p=thirdparty%2Fsamba.git

ctdb-ipalloc: Drop an unnecessary check

Deleted (and other inactive) nodes will have an empty list of known
IP addresses.

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 e969ab393e8..41beffc3016 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -1247,10 +1247,6 @@ create_merged_ip_list(struct ctdb_context *ctdb, struct ipalloc_state *ipalloc_s
 
 	for (i=0; i < ctdb->num_nodes; i++) {
 
-		if (ctdb->nodes[i]->flags & NODE_FLAGS_DELETED) {
-			continue;
-		}
-
 		public_ips = &ipalloc_state->known_public_ips[i];
 
 		for (j=0; j < public_ips->num; j++) {