recoverd: Move IP flags into ctdb_takeover.c

These should never be seen outside the IP allocation code.

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/include/ctdb_protocol.h b/include/ctdb_protocol.h
index 3133b4e6d916c0916a6008267a6656bbedb5cfa3..09ce01a5e3a46bdf8e38f1b72d25e6ed91b999c7 100644 (file)
--- a/include/ctdb_protocol.h
+++ b/include/ctdb_protocol.h
@@ -584,11 +584,6 @@ struct ctdb_node_map {
 #define NODE_FLAGS_DISABLED            (NODE_FLAGS_UNHEALTHY|NODE_FLAGS_PERMANENTLY_DISABLED)
 #define NODE_FLAGS_INACTIVE            (NODE_FLAGS_DELETED|NODE_FLAGS_DISCONNECTED|NODE_FLAGS_BANNED|NODE_FLAGS_STOPPED)
 
-/* These flags are ONLY valid within the recovery daemon */
-#define NODE_FLAGS_NOIPTAKEOVER                0x01000000 /* can not takeover additional IPs */
-#define NODE_FLAGS_NOIPHOST            0x02000000 /* can not host IPs */
-
-
 /*
  * Node capabilities
  */

diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index da9c4c93336d87dd006f9edd9917f3cecb5879c8..24c6298100146123c995085870ef4290166910c9 100644 (file)
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -33,6 +33,12 @@
 #define CTDB_ARP_INTERVAL 1
 #define CTDB_ARP_REPEAT   3
 
+/* These flags are ONLY valid within IP allocation code and must be
+ * cleared to avoid confusing other recovery daemon functions
+ */
+#define NODE_FLAGS_NOIPTAKEOVER                0x01000000 /* can not takeover additional IPs */
+#define NODE_FLAGS_NOIPHOST            0x02000000 /* can not host IPs */
+
 struct ctdb_iface {
        struct ctdb_iface *prev, *next;
        const char *name;