diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2015-10-29 16:45:41 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2015-11-04 00:47:14 +0100 |
| commit | e8f8c633610469d631782deaa6ef0eabae735b20 (patch) | |
| tree | ef9e7f5b2938aa2586df453f1ab88ba7b5a6578b | |
| parent | 1c828b4ed6127e0022f4512f65a4b8c1280aa36a (diff) | |
| download | samba-e8f8c633610469d631782deaa6ef0eabae735b20.tar.gz | |
ctdb-daemon: Rename struct ctdb_req_keepalive to ctdb_req_keepalive_old
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
| -rw-r--r-- | ctdb/include/ctdb_protocol.h | 2 | ||||
| -rw-r--r-- | 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; |