From: Martin Schwenke <martin@meltin.net>
Date: Tue, 5 Apr 2016 06:05:47 +0000 (+1000)
Subject: ctdb-client: Remove support for SET_RECLOCK
X-Git-Tag: tdb-1.3.10~934
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=312521f2647f2798c9a261bfa7e36eb3a54ea321;p=thirdparty%2Fsamba.git

ctdb-client: Remove support for SET_RECLOCK

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

diff --git a/ctdb/client/client.h b/ctdb/client/client.h
index e8288dc3f07..2aca4b5ca47 100644
--- a/ctdb/client/client.h
+++ b/ctdb/client/client.h
@@ -508,11 +508,6 @@ int ctdb_ctrl_get_reclock_file(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
 			       int destnode, struct timeval timeout,
 			       const char **reclock_file);
 
-int ctdb_ctrl_set_reclock_file(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
-			       struct ctdb_client_context *client,
-			       int destnode, struct timeval timeout,
-			       const char *reclock_file);
-
 int ctdb_ctrl_stop_node(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
 			struct ctdb_client_context *client,
 			int destnode, struct timeval timeout);
diff --git a/ctdb/client/client_control_sync.c b/ctdb/client/client_control_sync.c
index e14b02c6b2c..9971c9aa968 100644
--- a/ctdb/client/client_control_sync.c
+++ b/ctdb/client/client_control_sync.c
@@ -1789,35 +1789,6 @@ int ctdb_ctrl_get_reclock_file(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
 	return 0;
 }
 
-int ctdb_ctrl_set_reclock_file(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
-			       struct ctdb_client_context *client,
-			       int destnode, struct timeval timeout,
-			       const char *reclock_file)
-{
-	struct ctdb_req_control request;
-	struct ctdb_reply_control *reply;
-	int ret;
-
-	ctdb_req_control_set_reclock_file(&request, reclock_file);
-	ret = ctdb_client_control(mem_ctx, ev, client, destnode, timeout,
-				  &request, &reply);
-	if (ret != 0) {
-		DEBUG(DEBUG_ERR,
-		      ("Control SET_RECLOCK_FILE failed to node %u, ret=%d\n",
-		       destnode, ret));
-		return ret;
-	}
-
-	ret = ctdb_reply_control_set_reclock_file(reply);
-	if (ret != 0) {
-		DEBUG(DEBUG_ERR,
-		      ("Control SET_RECLOCK_FILE failed, ret=%d\n", ret));
-		return ret;
-	}
-
-	return 0;
-}
-
 int ctdb_ctrl_stop_node(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
 			struct ctdb_client_context *client,
 			int destnode, struct timeval timeout)
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 19f126ce871..4ed8f0aa298 100644
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -4312,34 +4312,6 @@ int ctdb_ctrl_getreclock(struct ctdb_context *ctdb, struct timeval timeout,
 	return 0;
 }
 
-/*
-  set the reclock filename for a node
- */
-int ctdb_ctrl_setreclock(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, const char *reclock)
-{
-	int ret;
-	TDB_DATA data;
-	int32_t res;
-
-	if (reclock == NULL) {
-	        data.dsize = 0;
-		data.dptr  = NULL;
-	} else {
-	        data.dsize = strlen(reclock) + 1;
-		data.dptr  = discard_const(reclock);
-	}
-
-	ret = ctdb_control(ctdb, destnode, 0, 
-			   CTDB_CONTROL_SET_RECLOCK_FILE, 0, data, 
-			   NULL, NULL, &res, &timeout, NULL);
-	if (ret != 0 || res != 0) {
-		DEBUG(DEBUG_ERR,(__location__ " ctdb_control for setreclock failed\n"));
-		return -1;
-	}
-
-	return 0;
-}
-
 /*
   stop a node
  */
diff --git a/ctdb/include/ctdb_client.h b/ctdb/include/ctdb_client.h
index a39d09693bc..606461ce6d3 100644
--- a/ctdb/include/ctdb_client.h
+++ b/ctdb/include/ctdb_client.h
@@ -555,9 +555,6 @@ int ctdb_ctrl_report_recd_lock_latency(struct ctdb_context *ctdb,
 int ctdb_ctrl_getreclock(struct ctdb_context *ctdb,
 			 struct timeval timeout, uint32_t destnode,
 			 TALLOC_CTX *mem_ctx, const char **reclock);
-int ctdb_ctrl_setreclock(struct ctdb_context *ctdb,
-			 struct timeval timeout, uint32_t destnode,
-			 const char *reclock);
 
 int ctdb_ctrl_stop_node(struct ctdb_context *ctdb, struct timeval timeout,
 			uint32_t destnode);