ctdb-daemon: Rename struct ctdb_control_transdb to ctdb_transdb

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

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index 7da0f33876b40d3e2ebf6bf37b84824ebf32a405..a850e5c6850dba9eff7525aa1fe09172ed2404ba 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -981,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

diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index 284cbecac61bbb72a6e83ec7d16eb646c65dd898..3b0c24794fc376cb6189cdd8db3333554c38a57a 100644 (file)
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -453,7 +453,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
                return ctdb_control_transaction_commit(ctdb, *(uint32_t *)indata.dptr);
 
        case CTDB_CONTROL_WIPE_DATABASE:
-               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_transdb));
+               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_transdb));
                return ctdb_control_wipe_database(ctdb, indata);
 
        case CTDB_CONTROL_UPTIME:
@@ -704,11 +704,11 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
                return ctdb_control_db_thaw(ctdb, *(uint32_t *)indata.dptr);
 
        case CTDB_CONTROL_DB_TRANSACTION_START:
-               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_transdb));
+               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_transdb));
                return ctdb_control_db_transaction_start(ctdb, indata);
 
        case CTDB_CONTROL_DB_TRANSACTION_COMMIT:
-               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_transdb));
+               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_transdb));
                return ctdb_control_db_transaction_commit(ctdb, indata);
 
        case CTDB_CONTROL_DB_TRANSACTION_CANCEL:

diff --git a/ctdb/server/ctdb_freeze.c b/ctdb/server/ctdb_freeze.c
index 94c070077ea73f6d1ef67508059c5bb4eafa0f3f..8aa0f9fb1f4235d2d626942147495b322e84c3ca 100644 (file)
--- a/ctdb/server/ctdb_freeze.c
+++ b/ctdb/server/ctdb_freeze.c
@@ -781,8 +781,8 @@ static int db_commit_transaction(struct ctdb_db_context *ctdb_db,
 int32_t ctdb_control_db_transaction_start(struct ctdb_context *ctdb,
                                          TDB_DATA indata)
 {
-       struct ctdb_control_transdb *w =
-               (struct ctdb_control_transdb *)indata.dptr;
+       struct ctdb_transdb *w =
+               (struct ctdb_transdb *)indata.dptr;
        struct ctdb_db_context *ctdb_db;
        struct db_start_transaction_state state;
 
@@ -794,7 +794,7 @@ int32_t ctdb_control_db_transaction_start(struct ctdb_context *ctdb,
                return -1;
        }
 
-       state.transaction_id = w->transaction_id;
+       state.transaction_id = w->tid;
        state.transaction_started = true;
 
        return db_start_transaction(ctdb_db, &state);
@@ -828,8 +828,8 @@ int32_t ctdb_control_db_transaction_cancel(struct ctdb_context *ctdb,
 int32_t ctdb_control_db_transaction_commit(struct ctdb_context *ctdb,
                                           TDB_DATA indata)
 {
-       struct ctdb_control_transdb *w =
-               (struct ctdb_control_transdb *)indata.dptr;
+       struct ctdb_transdb *w =
+               (struct ctdb_transdb *)indata.dptr;
        struct ctdb_db_context *ctdb_db;
        struct db_commit_transaction_state state;
        int healthy_nodes, i;
@@ -849,7 +849,7 @@ int32_t ctdb_control_db_transaction_commit(struct ctdb_context *ctdb,
                }
        }
 
-       state.transaction_id = w->transaction_id;
+       state.transaction_id = w->tid;
        state.healthy_nodes = healthy_nodes;
 
        return db_commit_transaction(ctdb_db, &state);
@@ -960,7 +960,7 @@ fail:
  */
 int32_t ctdb_control_wipe_database(struct ctdb_context *ctdb, TDB_DATA indata)
 {
-       struct ctdb_control_transdb w = *(struct ctdb_control_transdb *)indata.dptr;
+       struct ctdb_transdb w = *(struct ctdb_transdb *)indata.dptr;
        struct ctdb_db_context *ctdb_db;
 
        ctdb_db = find_ctdb_db(ctdb, w.db_id);
@@ -979,8 +979,8 @@ int32_t ctdb_control_wipe_database(struct ctdb_context *ctdb, TDB_DATA indata)
                return -1;
        }
 
-       if (w.transaction_id != ctdb_db->freeze_transaction_id) {
-               DEBUG(DEBUG_ERR,(__location__ " incorrect transaction id 0x%x in commit\n", w.transaction_id));
+       if (w.tid != ctdb_db->freeze_transaction_id) {
+               DEBUG(DEBUG_ERR,(__location__ " incorrect transaction id 0x%x in commit\n", w.tid));
                return -1;
        }
 

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 3c8e5d87ccec767573cc15e2ccdfb0c07bc0d830..fcfc04ec15bf6998db96d4df06c0d57b0485c8ad 100644 (file)
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -1515,7 +1515,7 @@ static int recover_database(struct ctdb_recoverd *rec,
        int ret;
        struct ctdb_context *ctdb = rec->ctdb;
        TDB_DATA data;
-       struct ctdb_control_transdb w;
+       struct ctdb_transdb w;
        uint32_t *nodes;
 
        recdb = create_recdb(ctdb, mem_ctx);
@@ -1534,7 +1534,7 @@ static int recover_database(struct ctdb_recoverd *rec,
 
        /* wipe all the remote databases. This is safe as we are in a transaction */
        w.db_id = dbid;
-       w.transaction_id = transaction_id;
+       w.tid = transaction_id;
 
        data.dptr = (void *)&w;
        data.dsize = sizeof(w);

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index f53d5bb0db87c29c0ffbe7befc66cf99ba8c4c30..9788d29d88657fdef915dfb403390cceab6c5565 100644 (file)
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -5600,7 +5600,7 @@ static int control_restoredb(struct ctdb_context *ctdb, int argc, const char **a
        struct ctdb_node_map_old *nodemap=NULL;
        struct ctdb_vnn_map *vnnmap=NULL;
        int i, fh;
-       struct ctdb_control_transdb w;
+       struct ctdb_transdb w;
        uint32_t *nodes;
        uint32_t generation;
        struct tm *tm;
@@ -5706,7 +5706,7 @@ static int control_restoredb(struct ctdb_context *ctdb, int argc, const char **a
 
 
        w.db_id = ctdb_db->db_id;
-       w.transaction_id = generation;
+       w.tid = generation;
 
        data.dptr = (void *)&w;
        data.dsize = sizeof(w);
@@ -5881,7 +5881,7 @@ static int control_wipedb(struct ctdb_context *ctdb, int argc,
        struct ctdb_node_map_old *nodemap = NULL;
        struct ctdb_vnn_map *vnnmap = NULL;
        int i;
-       struct ctdb_control_transdb w;
+       struct ctdb_transdb w;
        uint32_t *nodes;
        uint32_t generation;
        uint8_t flags;
@@ -5959,7 +5959,7 @@ static int control_wipedb(struct ctdb_context *ctdb, int argc,
        }
 
        w.db_id = ctdb_db->db_id;
-       w.transaction_id = generation;
+       w.tid = generation;
 
        data.dptr = (void *)&w;
        data.dsize = sizeof(w);