ctdb-daemon: Rename struct ctdb_control_transdb to ctdb_transdb

[obnox/samba/samba-obnox.git] / ctdb / include / ctdb_protocol.h

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index cf8a82df2f95cdc279b0c0c9c3f01d1eb92201c8..a850e5c6850dba9eff7525aa1fe09172ed2404ba 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -845,7 +845,7 @@ struct ctdb_tickle_list_old {
 };
 
 /* all tunable variables go in here */
-struct ctdb_tunable {
+struct ctdb_tunable_list {
        uint32_t max_redirect_count;
        uint32_t seqnum_interval; /* unit is ms */
        uint32_t control_timeout;
@@ -921,20 +921,9 @@ enum ctdb_runstate {
 
 /*
   struct holding a ctdb_sock_addr and an interface name,
-  used to add/remove public addresses
+  used to add/remove public addresses and grat arp
  */
-struct ctdb_control_ip_iface {
-       ctdb_sock_addr addr;
-       uint32_t mask;
-       uint32_t len;
-       char iface[1];
-};
-
-/*
-  struct holding a ctdb_sock_addr and an interface name,
-  used for send_gratious_arp
- */
-struct ctdb_control_gratious_arp {
+struct ctdb_addr_info_old {
        ctdb_sock_addr addr;
        uint32_t mask;
        uint32_t len;
@@ -953,7 +942,7 @@ struct ctdb_node_flag_change {
 #define CTDB_LMASTER_ANY       0xffffffff
 
 /* structure used for pulldb control */
-struct ctdb_control_pulldb {
+struct ctdb_pulldb {
        uint32_t db_id;
        uint32_t lmaster;
 };
@@ -968,7 +957,7 @@ struct ctdb_marshall_buffer {
 /*
   structure for setting a tunable
  */
-struct ctdb_control_set_tunable {
+struct ctdb_tunable_old {
        uint32_t value;
        uint32_t length;
        uint8_t  name[1];
@@ -992,9 +981,9 @@ struct ctdb_control_list_tunable {
 };
 
 
-struct ctdb_control_transdb {
+struct ctdb_transdb {
        uint32_t db_id;
-       uint32_t transaction_id;
+       uint32_t tid;
 };
 
 #define CTDB_PUBLIC_IP_FLAGS_ONLY_AVAILABLE 0x00010000