ctdb-protocol: Drop protocol client functions for recmaster controls

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 499d9329c5459f8066803b60eb274cd6d8d79702..48e4e84391dfd0bfd52ba1018d602e2bc2a59a78 100644 (file)
--- a/ctdb/protocol/protocol_api.h
+++ b/ctdb/protocol/protocol_api.h
@@ -270,14 +270,6 @@ void ctdb_req_control_get_pid(struct ctdb_req_control *request);
 int ctdb_reply_control_get_pid(struct ctdb_reply_control *reply,
                               pid_t *pid);
 
-void ctdb_req_control_get_recmaster(struct ctdb_req_control *request);
-int ctdb_reply_control_get_recmaster(struct ctdb_reply_control *reply,
-                                    uint32_t *recmaster);
-
-void ctdb_req_control_set_recmaster(struct ctdb_req_control *request,
-                                   int recmaster);
-int ctdb_reply_control_set_recmaster(struct ctdb_reply_control *reply);
-
 void ctdb_req_control_freeze(struct ctdb_req_control *request,
                             uint32_t priority);
 int ctdb_reply_control_freeze(struct ctdb_reply_control *reply);

diff --git a/ctdb/protocol/protocol_client.c b/ctdb/protocol/protocol_client.c
index dcce83f02a1c6e9cb0a99aa10036e716e3967794..9ca2d4e7b8dbb1c6b715f9f087b5d19133def809 100644 (file)
--- a/ctdb/protocol/protocol_client.c
+++ b/ctdb/protocol/protocol_client.c
@@ -557,52 +557,6 @@ int ctdb_reply_control_get_pid(struct ctdb_reply_control *reply,
        return reply->status;
 }
 
-/* CTDB_CONTROL_GET_RECMASTER */
-
-void ctdb_req_control_get_recmaster(struct ctdb_req_control *request)
-{
-       request->opcode = CTDB_CONTROL_GET_RECMASTER;
-       request->pad = 0;
-       request->srvid = 0;
-       request->client_id = 0;
-       request->flags = 0;
-
-       request->rdata.opcode = CTDB_CONTROL_GET_RECMASTER;
-}
-
-int ctdb_reply_control_get_recmaster(struct ctdb_reply_control *reply,
-                                    uint32_t *recmaster)
-{
-       if (reply->rdata.opcode != CTDB_CONTROL_GET_RECMASTER) {
-               return EPROTO;
-       }
-
-       *recmaster = reply->status;
-       reply->status = 0;
-
-       return reply->status;
-}
-
-/* CTDB_CONTROL_SET_RECMASTER */
-
-void ctdb_req_control_set_recmaster(struct ctdb_req_control *request,
-                                   int recmaster)
-{
-       request->opcode = CTDB_CONTROL_SET_RECMASTER;
-       request->pad = 0;
-       request->srvid = 0;
-       request->client_id = 0;
-       request->flags = 0;
-
-       request->rdata.opcode = CTDB_CONTROL_SET_RECMASTER;
-       request->rdata.data.recmaster = recmaster;
-}
-
-int ctdb_reply_control_set_recmaster(struct ctdb_reply_control *reply)
-{
-       return ctdb_reply_control_generic(reply, CTDB_CONTROL_SET_RECMASTER);
-}
-
 /* CTDB_CONTROL_FREEZE */
 
 void ctdb_req_control_freeze(struct ctdb_req_control *request,