ctdb-daemon: Rename struct ctdb_control_pulldb to ctdb_pulldb

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

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index dc3098924b39febe114fd72bac577a6c013efe1d..a1f1d378ab9e6f5565d4490f03ef88b2f29ea7cd 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -1668,16 +1668,16 @@ struct ctdb_client_control_state *ctdb_ctrl_pulldb_send(
        uint32_t lmaster, TALLOC_CTX *mem_ctx, struct timeval timeout)
 {
        TDB_DATA indata;
-       struct ctdb_control_pulldb *pull;
+       struct ctdb_pulldb *pull;
        struct ctdb_client_control_state *state;
 
-       pull = talloc(mem_ctx, struct ctdb_control_pulldb);
+       pull = talloc(mem_ctx, struct ctdb_pulldb);
        CTDB_NO_MEMORY_NULL(ctdb, pull);
 
        pull->db_id   = dbid;
        pull->lmaster = lmaster;
 
-       indata.dsize = sizeof(struct ctdb_control_pulldb);
+       indata.dsize = sizeof(struct ctdb_pulldb);
        indata.dptr  = (unsigned char *)pull;
 
        state = ctdb_control_send(ctdb, destnode, 0, 

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index b235f4622a5885bfa9f9912626d02dc6485c22aa..c7f31af9323ce4018ec2884c745dcd3c86684d43 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -942,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;
 };

diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index 1ba1ef796eefee21c25a32595dd915b9368baabb..284cbecac61bbb72a6e83ec7d16eb646c65dd898 100644 (file)
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -193,7 +193,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
                return ctdb_control_setvnnmap(ctdb, opcode, indata, outdata);
 
        case CTDB_CONTROL_PULL_DB: 
-               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_pulldb));
+               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_pulldb));
                return ctdb_control_pull_db(ctdb, indata, outdata);
 
        case CTDB_CONTROL_SET_DMASTER: 

diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c
index 623d18ad03b40075d6ca2d0690adad218bd77071..f438951404e1114421210c0b00cddaca83d484f1 100644 (file)
--- a/ctdb/server/ctdb_recover.c
+++ b/ctdb/server/ctdb_recover.c
@@ -247,12 +247,12 @@ static int traverse_pulldb(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
  */
 int32_t ctdb_control_pull_db(struct ctdb_context *ctdb, TDB_DATA indata, TDB_DATA *outdata)
 {
-       struct ctdb_control_pulldb *pull;
+       struct ctdb_pulldb *pull;
        struct ctdb_db_context *ctdb_db;
        struct pulldb_data params;
        struct ctdb_marshall_buffer *reply;
 
-       pull = (struct ctdb_control_pulldb *)indata.dptr;
+       pull = (struct ctdb_pulldb *)indata.dptr;
 
        ctdb_db = find_ctdb_db(ctdb, pull->db_id);
        if (!ctdb_db) {