ctdb-ipalloc: IP allocation state is now an opaque structure

It is private to the IP allocation module.

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

diff --git a/ctdb/server/ipalloc.h b/ctdb/server/ipalloc.h
index 13fdfed36eb5832ee795dd82901d74441d507d73..66a5e75eb6af5db595cd4af39d3f2e8cbdf09c2b 100644 (file)
--- a/ctdb/server/ipalloc.h
+++ b/ctdb/server/ipalloc.h
@@ -43,19 +43,7 @@ enum ipalloc_algorithm {
        IPALLOC_LCP2,
 };
 
-struct ipalloc_state {
-       uint32_t num;
-
-       /* Arrays with data for each node */
-       struct ctdb_public_ip_list *available_public_ips;
-       bool *noiptakeover;
-       bool *noiphost;
-
-       struct public_ip_list *all_ips;
-       enum ipalloc_algorithm algorithm;
-       bool no_ip_failback;
-       uint32_t *force_rebalance_nodes;
-};
+struct ipalloc_state;
 
 struct ipalloc_state * ipalloc_state_init(TALLOC_CTX *mem_ctx,
                                          uint32_t num_nodes,

diff --git a/ctdb/server/ipalloc_private.h b/ctdb/server/ipalloc_private.h
index 3ffdeba24095ed2810d957f44109c3831a846462..232868738bfa518ada1db57eef29a4c738142b60 100644 (file)
--- a/ctdb/server/ipalloc_private.h
+++ b/ctdb/server/ipalloc_private.h
@@ -26,6 +26,20 @@
 
 #include "server/ipalloc.h"
 
+struct ipalloc_state {
+       uint32_t num;
+
+       /* Arrays with data for each node */
+       struct ctdb_public_ip_list *available_public_ips;
+       bool *noiptakeover;
+       bool *noiphost;
+
+       struct public_ip_list *all_ips;
+       enum ipalloc_algorithm algorithm;
+       bool no_ip_failback;
+       uint32_t *force_rebalance_nodes;
+};
+
 bool can_node_takeover_ip(struct ipalloc_state *ipalloc_state,
                          int32_t pnn,
                          struct public_ip_list *ip);