From e8f8c633610469d631782deaa6ef0eabae735b20 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Thu, 29 Oct 2015 16:45:41 +1100 Subject: [PATCH] ctdb-daemon: Rename struct ctdb_req_keepalive to ctdb_req_keepalive_old Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke --- ctdb/include/ctdb_protocol.h | 2 +- ctdb/server/ctdb_call.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h index e493d1c935f..6dcc0fcf827 100644 --- a/ctdb/include/ctdb_protocol.h +++ b/ctdb/include/ctdb_protocol.h @@ -501,7 +501,7 @@ struct ctdb_reply_control_old { uint8_t data[1]; }; -struct ctdb_req_keepalive { +struct ctdb_req_keepalive_old { struct ctdb_req_header hdr; }; diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c index 80edfb1b405..78c8573ca32 100644 --- a/ctdb/server/ctdb_call.c +++ b/ctdb/server/ctdb_call.c @@ -1570,7 +1570,7 @@ int ctdb_daemon_call_recv(struct ctdb_call_state *state, struct ctdb_call *call) */ void ctdb_send_keepalive(struct ctdb_context *ctdb, uint32_t destnode) { - struct ctdb_req_keepalive *r; + struct ctdb_req_keepalive_old *r; if (ctdb->methods == NULL) { DEBUG(DEBUG_INFO,(__location__ " Failed to send keepalive. Transport is DOWN\n")); @@ -1578,8 +1578,8 @@ void ctdb_send_keepalive(struct ctdb_context *ctdb, uint32_t destnode) } r = ctdb_transport_allocate(ctdb, ctdb, CTDB_REQ_KEEPALIVE, - sizeof(struct ctdb_req_keepalive), - struct ctdb_req_keepalive); + sizeof(struct ctdb_req_keepalive_old), + struct ctdb_req_keepalive_old); CTDB_NO_MEMORY_FATAL(ctdb, r); r->hdr.destnode = destnode; r->hdr.reqid = 0; -- 2.34.1