From: Martin Schwenke <martin@meltin.net>
Date: Tue, 5 May 2020 13:58:38 +0000 (+1000)
Subject: ctdb-protocol: Drop protocol client functions for recmaster controls
X-Git-Tag: tdb-1.4.6~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=193b624d26acffaa39a5fc393268f152b5809f99;p=thirdparty%2Fsamba.git

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 499d9329c54..48e4e84391d 100644
--- 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 dcce83f02a1..9ca2d4e7b8d 100644
--- 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,