From 44465817dd2d940d08e9c05f257c5032d8add816 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Thu, 10 Nov 2016 16:09:24 +1100 Subject: [PATCH] ctdb-protocol: Move CTDB_PUBLIC_IP_FLAGS_ONLY_AVAILABLE to protocol.h The protocol code needs it. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/include/ctdb_protocol.h | 2 -- ctdb/protocol/protocol.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h index 2b2fd76b69f..2fb3b6d0dca 100644 --- a/ctdb/include/ctdb_protocol.h +++ b/ctdb/include/ctdb_protocol.h @@ -266,8 +266,6 @@ struct ctdb_control_list_tunable { }; -#define CTDB_PUBLIC_IP_FLAGS_ONLY_AVAILABLE 0x00010000 - struct ctdb_public_ip_info_old { struct ctdb_public_ip ip; uint32_t active_idx; diff --git a/ctdb/protocol/protocol.h b/ctdb/protocol/protocol.h index f61af3bc4a0..c4a7c010de5 100644 --- a/ctdb/protocol/protocol.h +++ b/ctdb/protocol/protocol.h @@ -913,6 +913,8 @@ struct ctdb_req_control { uint32_t client_id; #define CTDB_CTRL_FLAG_NOREPLY 1 #define CTDB_CTRL_FLAG_OPCODE_SPECIFIC 0xFFFF0000 +/* Ugly overloading of this field... */ +#define CTDB_PUBLIC_IP_FLAGS_ONLY_AVAILABLE 0x00010000 uint32_t flags; struct ctdb_req_control_data rdata; };