From: Amitay Isaacs Date: Thu, 29 Oct 2015 05:29:01 +0000 (+1100) Subject: ctdb-daemon: Rename struct ctdb_reply_call to ctdb_reply_call_old X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=277c21f0cd86510c421642eae9267c6fae44df78;p=obnox%2Fsamba%2Fsamba-obnox.git ctdb-daemon: Rename struct ctdb_reply_call to ctdb_reply_call_old Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke --- diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 79129412e13..842d4ef75f8 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -164,7 +164,7 @@ static int ctdb_client_queue_pkt(struct ctdb_context *ctdb, struct ctdb_req_head */ static void ctdb_client_reply_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr) { - struct ctdb_reply_call *c = (struct ctdb_reply_call *)hdr; + struct ctdb_reply_call_old *c = (struct ctdb_reply_call_old *)hdr; struct ctdb_client_call_state *state; state = reqid_find(ctdb->idr, hdr->reqid, struct ctdb_client_call_state); diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h index 3eee08d7b42..bff1d6789e0 100644 --- a/ctdb/include/ctdb_protocol.h +++ b/ctdb/include/ctdb_protocol.h @@ -440,7 +440,7 @@ struct ctdb_req_call_old { uint8_t data[1]; /* key[] followed by calldata[] */ }; -struct ctdb_reply_call { +struct ctdb_reply_call_old { struct ctdb_req_header hdr; uint32_t status; uint32_t datalen; diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c index 278e0ddc3a4..62381b85fe5 100644 --- a/ctdb/server/ctdb_call.c +++ b/ctdb/server/ctdb_call.c @@ -889,7 +889,7 @@ void ctdb_request_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr) { struct ctdb_req_call_old *c = (struct ctdb_req_call_old *)hdr; TDB_DATA data; - struct ctdb_reply_call *r; + struct ctdb_reply_call_old *r; int ret, len; struct ctdb_ltdb_header header; struct ctdb_call *call; @@ -1065,9 +1065,9 @@ void ctdb_request_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr) DEBUG(DEBUG_ERR,(__location__ " ctdb_ltdb_unlock() failed with error %d\n", ret)); } - len = offsetof(struct ctdb_reply_call, data) + data.dsize + sizeof(struct ctdb_ltdb_header); + len = offsetof(struct ctdb_reply_call_old, data) + data.dsize + sizeof(struct ctdb_ltdb_header); r = ctdb_transport_allocate(ctdb, ctdb, CTDB_REPLY_CALL, len, - struct ctdb_reply_call); + struct ctdb_reply_call_old); CTDB_NO_MEMORY_FATAL(ctdb, r); r->hdr.destnode = c->hdr.srcnode; r->hdr.reqid = c->hdr.reqid; @@ -1150,9 +1150,9 @@ void ctdb_request_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr) DEBUG(DEBUG_ERR,(__location__ " ctdb_ltdb_unlock() failed with error %d\n", ret)); } - len = offsetof(struct ctdb_reply_call, data) + call->reply_data.dsize; + len = offsetof(struct ctdb_reply_call_old, data) + call->reply_data.dsize; r = ctdb_transport_allocate(ctdb, ctdb, CTDB_REPLY_CALL, len, - struct ctdb_reply_call); + struct ctdb_reply_call_old); CTDB_NO_MEMORY_FATAL(ctdb, r); r->hdr.destnode = hdr->srcnode; r->hdr.reqid = hdr->reqid; @@ -1177,7 +1177,7 @@ void ctdb_request_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr) */ void ctdb_reply_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr) { - struct ctdb_reply_call *c = (struct ctdb_reply_call *)hdr; + struct ctdb_reply_call_old *c = (struct ctdb_reply_call_old *)hdr; struct ctdb_call_state *state; state = reqid_find(ctdb->idr, hdr->reqid, struct ctdb_call_state); diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index 03266457235..81bb98d4d67 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -318,7 +318,7 @@ static void daemon_call_from_client_callback(struct ctdb_call_state *state) { struct daemon_call_state *dstate = talloc_get_type(state->async.private_data, struct daemon_call_state); - struct ctdb_reply_call *r; + struct ctdb_reply_call_old *r; int res; uint32_t length; struct ctdb_client *client = dstate->client; @@ -336,7 +336,7 @@ static void daemon_call_from_client_callback(struct ctdb_call_state *state) return; } - length = offsetof(struct ctdb_reply_call, data) + dstate->call->reply_data.dsize; + length = offsetof(struct ctdb_reply_call_old, data) + dstate->call->reply_data.dsize; /* If the client asked for readonly FETCH, we remapped this to FETCH_WITH_HEADER when calling the daemon. So we must strip the extra header off the reply data before passing @@ -348,7 +348,7 @@ static void daemon_call_from_client_callback(struct ctdb_call_state *state) } r = ctdbd_allocate_pkt(client->ctdb, dstate, CTDB_REPLY_CALL, - length, struct ctdb_reply_call); + length, struct ctdb_reply_call_old); if (r == NULL) { DEBUG(DEBUG_ERR, (__location__ " Failed to allocate reply_call in ctdb daemon\n")); CTDB_DECREMENT_STAT(client->ctdb, pending_calls); diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index 95179a854ec..4ed1105d253 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -978,7 +978,7 @@ int ctdbd_parse(struct ctdbd_connection *conn, uint32_t db_id, { struct ctdb_req_call_old req; struct ctdb_req_header *hdr = NULL; - struct ctdb_reply_call *reply; + struct ctdb_reply_call_old *reply; struct iovec iov[2]; ssize_t nwritten; uint32_t flags; @@ -1020,7 +1020,7 @@ int ctdbd_parse(struct ctdbd_connection *conn, uint32_t db_id, ret = EIO; goto fail; } - reply = (struct ctdb_reply_call *)hdr; + reply = (struct ctdb_reply_call_old *)hdr; if (reply->datalen == 0) { /*