ctdb-protocol: Drop client functions for old-style database pull/push

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/protocol/protocol_api.h b/ctdb/protocol/protocol_api.h
index bdb4bc0e2ea874f3c19339bf7e5b698868708dcb..7bbe33b22fe06dcd2113e5c4884208923fce875c 100644 (file)
--- a/ctdb/protocol/protocol_api.h
+++ b/ctdb/protocol/protocol_api.h
@@ -221,16 +221,6 @@ int ctdb_reply_control_get_dbmap(struct ctdb_reply_control *reply,
                                 TALLOC_CTX *mem_ctx,
                                 struct ctdb_dbid_map **dbmap);
 
-void ctdb_req_control_pull_db(struct ctdb_req_control *request,
-                             struct ctdb_pulldb *pulldb);
-int ctdb_reply_control_pull_db(struct ctdb_reply_control *reply,
-                              TALLOC_CTX *mem_ctx,
-                              struct ctdb_rec_buffer **recbuf);
-
-void ctdb_req_control_push_db(struct ctdb_req_control *request,
-                             struct ctdb_rec_buffer *recbuf);
-int ctdb_reply_control_push_db(struct ctdb_reply_control *reply);
-
 void ctdb_req_control_get_recmode(struct ctdb_req_control *request);
 int ctdb_reply_control_get_recmode(struct ctdb_reply_control *reply,
                                   int *recmode);

diff --git a/ctdb/protocol/protocol_client.c b/ctdb/protocol/protocol_client.c
index cde544feb5279d19fdde32fca05895facbc9c3cd..6d850be86df3a7888b2827aa21e9638b6e6b4af0 100644 (file)
--- a/ctdb/protocol/protocol_client.c
+++ b/ctdb/protocol/protocol_client.c
@@ -281,55 +281,6 @@ int ctdb_reply_control_get_dbmap(struct ctdb_reply_control *reply,
        return reply->status;
 }
 
-/* CTDB_CONTROL_PULL_DB */
-
-void ctdb_req_control_pull_db(struct ctdb_req_control *request,
-                             struct ctdb_pulldb *pulldb)
-{
-       request->opcode = CTDB_CONTROL_PULL_DB;
-       request->pad = 0;
-       request->srvid = 0;
-       request->client_id = 0;
-       request->flags = 0;
-
-       request->rdata.opcode = CTDB_CONTROL_PULL_DB;
-       request->rdata.data.pulldb = pulldb;
-}
-
-int ctdb_reply_control_pull_db(struct ctdb_reply_control *reply,
-                              TALLOC_CTX *mem_ctx,
-                              struct ctdb_rec_buffer **recbuf)
-{
-       if (reply->rdata.opcode != CTDB_CONTROL_PULL_DB) {
-               return EPROTO;
-       }
-
-       if (reply->status == 0) {
-               *recbuf = talloc_steal(mem_ctx, reply->rdata.data.recbuf);
-       }
-       return reply->status;
-}
-
-/* CTDB_CONTROL_PUSH_DB */
-
-void ctdb_req_control_push_db(struct ctdb_req_control *request,
-                             struct ctdb_rec_buffer *recbuf)
-{
-       request->opcode = CTDB_CONTROL_PUSH_DB;
-       request->pad = 0;
-       request->srvid = 0;
-       request->client_id = 0;
-       request->flags = 0;
-
-       request->rdata.opcode = CTDB_CONTROL_PUSH_DB;
-       request->rdata.data.recbuf = recbuf;
-}
-
-int ctdb_reply_control_push_db(struct ctdb_reply_control *reply)
-{
-       return ctdb_reply_control_generic(reply, CTDB_CONTROL_PUSH_DB);
-}
-
 /* CTDB_CONTROL_GET_RECMODE */
 
 void ctdb_req_control_get_recmode(struct ctdb_req_control *request)