ctdb-daemon: Rename struct ctdb_reply_dmaster to ctdb_reply_dmaster_old

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 475a795f9d0f1e7e838095d701381cd37e1f07f8..f4d07d004e639a8b6dc93d369842fc94fa885a6e 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -464,7 +464,7 @@ struct ctdb_req_dmaster_old {
        uint8_t  data[1];
 };
 
-struct ctdb_reply_dmaster {
+struct ctdb_reply_dmaster_old {
        struct ctdb_req_header hdr;
        uint32_t db_id;
        uint64_t rsn;

diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c
index c4ffb6258946dd84f84fabd3c3cf5c2782ad1de2..80edfb1b40528a45bc3b6df9e1751f0668951176 100644 (file)
--- a/ctdb/server/ctdb_call.c
+++ b/ctdb/server/ctdb_call.c
@@ -169,7 +169,7 @@ static void ctdb_send_dmaster_reply(struct ctdb_db_context *ctdb_db,
                                    uint32_t reqid)
 {
        struct ctdb_context *ctdb = ctdb_db->ctdb;
-       struct ctdb_reply_dmaster *r;
+       struct ctdb_reply_dmaster_old *r;
        int ret, len;
        TALLOC_CTX *tmp_ctx;
 
@@ -195,9 +195,9 @@ static void ctdb_send_dmaster_reply(struct ctdb_db_context *ctdb_db,
        tmp_ctx = talloc_new(ctdb);
 
        /* send the CTDB_REPLY_DMASTER */
-       len = offsetof(struct ctdb_reply_dmaster, data) + key.dsize + data.dsize + sizeof(uint32_t);
+       len = offsetof(struct ctdb_reply_dmaster_old, data) + key.dsize + data.dsize + sizeof(uint32_t);
        r = ctdb_transport_allocate(ctdb, tmp_ctx, CTDB_REPLY_DMASTER, len,
-                                   struct ctdb_reply_dmaster);
+                                   struct ctdb_reply_dmaster_old);
        CTDB_NO_MEMORY_FATAL(ctdb, r);
 
        r->hdr.destnode  = new_dmaster;
@@ -1283,7 +1283,7 @@ finished_ro:
  */
 void ctdb_reply_dmaster(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
 {
-       struct ctdb_reply_dmaster *c = (struct ctdb_reply_dmaster *)hdr;
+       struct ctdb_reply_dmaster_old *c = (struct ctdb_reply_dmaster_old *)hdr;
        struct ctdb_db_context *ctdb_db;
        TDB_DATA key, data;
        uint32_t record_flags = 0;
@@ -1309,7 +1309,7 @@ void ctdb_reply_dmaster(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
        key.dsize = c->keylen;
        data.dptr = &c->data[key.dsize];
        data.dsize = c->datalen;
-       len = offsetof(struct ctdb_reply_dmaster, data) + key.dsize + data.dsize
+       len = offsetof(struct ctdb_reply_dmaster_old, data) + key.dsize + data.dsize
                + sizeof(uint32_t);
        if (len <= c->hdr.length) {
                memcpy(&record_flags, &c->data[c->keylen + c->datalen],