ctdb-daemon: Rename struct ctdb_reply_error to ctdb_reply_error_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 bff1d6789e0ddb35601fd538745612b52cdb73bf..d7966879a359c7e34dad30b5be71f1a45b304beb 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -447,7 +447,7 @@ struct ctdb_reply_call_old {
        uint8_t  data[1];
 };
 
-struct ctdb_reply_error {
+struct ctdb_reply_error_old {
        struct ctdb_req_header hdr;
        uint32_t status;
        uint32_t msglen;

diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c
index 62381b85fe550a7743111000eadf2fc843b6ff29..861b7daddf17426660fb20f0416e289200d4101a 100644 (file)
--- a/ctdb/server/ctdb_call.c
+++ b/ctdb/server/ctdb_call.c
@@ -82,7 +82,7 @@ static void ctdb_send_error(struct ctdb_context *ctdb,
                            const char *fmt, ...)
 {
        va_list ap;
-       struct ctdb_reply_error *r;
+       struct ctdb_reply_error_old *r;
        char *msg;
        int msglen, len;
 
@@ -99,9 +99,9 @@ static void ctdb_send_error(struct ctdb_context *ctdb,
        va_end(ap);
 
        msglen = strlen(msg)+1;
-       len = offsetof(struct ctdb_reply_error, msg);
+       len = offsetof(struct ctdb_reply_error_old, msg);
        r = ctdb_transport_allocate(ctdb, msg, CTDB_REPLY_ERROR, len + msglen, 
-                                   struct ctdb_reply_error);
+                                   struct ctdb_reply_error_old);
        CTDB_NO_MEMORY_FATAL(ctdb, r);
 
        r->hdr.destnode  = hdr->srcnode;
@@ -1337,7 +1337,7 @@ void ctdb_reply_dmaster(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
 */
 void ctdb_reply_error(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
 {
-       struct ctdb_reply_error *c = (struct ctdb_reply_error *)hdr;
+       struct ctdb_reply_error_old *c = (struct ctdb_reply_error_old *)hdr;
        struct ctdb_call_state *state;
 
        state = reqid_find(ctdb->idr, hdr->reqid, struct ctdb_call_state);