ctdb-daemon: Rename struct ctdb_req_dmaster to ctdb_req_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 d7966879a359c7e34dad30b5be71f1a45b304beb..475a795f9d0f1e7e838095d701381cd37e1f07f8 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -454,7 +454,7 @@ struct ctdb_reply_error_old {
        uint8_t  msg[1];
 };
 
-struct ctdb_req_dmaster {
+struct ctdb_req_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 861b7daddf17426660fb20f0416e289200d4101a..c4ffb6258946dd84f84fabd3c3cf5c2782ad1de2 100644 (file)
--- a/ctdb/server/ctdb_call.c
+++ b/ctdb/server/ctdb_call.c
@@ -228,7 +228,7 @@ static void ctdb_call_send_dmaster(struct ctdb_db_context *ctdb_db,
                                   struct ctdb_ltdb_header *header,
                                   TDB_DATA *key, TDB_DATA *data)
 {
-       struct ctdb_req_dmaster *r;
+       struct ctdb_req_dmaster_old *r;
        struct ctdb_context *ctdb = ctdb_db->ctdb;
        int len;
        uint32_t lmaster = ctdb_lmaster(ctdb, key);
@@ -248,10 +248,10 @@ static void ctdb_call_send_dmaster(struct ctdb_db_context *ctdb_db,
                return;
        }
        
-       len = offsetof(struct ctdb_req_dmaster, data) + key->dsize + data->dsize
+       len = offsetof(struct ctdb_req_dmaster_old, data) + key->dsize + data->dsize
                        + sizeof(uint32_t);
        r = ctdb_transport_allocate(ctdb, ctdb, CTDB_REQ_DMASTER, len, 
-                                   struct ctdb_req_dmaster);
+                                   struct ctdb_req_dmaster_old);
        CTDB_NO_MEMORY_FATAL(ctdb, r);
        r->hdr.destnode  = lmaster;
        r->hdr.reqid     = c->hdr.reqid;
@@ -577,7 +577,7 @@ static int dmaster_defer_add(struct ctdb_db_context *ctdb_db,
 */
 void ctdb_request_dmaster(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
 {
-       struct ctdb_req_dmaster *c = (struct ctdb_req_dmaster *)hdr;
+       struct ctdb_req_dmaster_old *c = (struct ctdb_req_dmaster_old *)hdr;
        TDB_DATA key, data, data2;
        struct ctdb_ltdb_header header;
        struct ctdb_db_context *ctdb_db;
@@ -606,7 +606,7 @@ void ctdb_request_dmaster(struct ctdb_context *ctdb, struct ctdb_req_header *hdr
        key.dsize = c->keylen;
        data.dptr = c->data + c->keylen;
        data.dsize = c->datalen;
-       len = offsetof(struct ctdb_req_dmaster, data) + key.dsize + data.dsize
+       len = offsetof(struct ctdb_req_dmaster_old, data) + key.dsize + data.dsize
                        + sizeof(uint32_t);
        if (len <= c->hdr.length) {
                memcpy(&record_flags, &c->data[c->keylen + c->datalen],