make the getrecovery master control use the new generic set_callback

[sahlberg/ctdb.git] / libctdb / libctdb.c

diff --git a/libctdb/libctdb.c b/libctdb/libctdb.c
index a17ad143f8676ccd17fc1ed31eb50be374ba00f6..e4a5ea6e6d06fa7eedd2b159bcf41cc48cae8a65 100644 (file)
--- a/libctdb/libctdb.c
+++ b/libctdb/libctdb.c
@@ -292,29 +292,11 @@ int ctdb_getpnn(struct ctdb_context *ctdb, uint32_t destnode, uint32_t *pnn)
 /***********************
  * GET RECOVERY MASTER *
  ***********************/
-static void
-ctdb_getrecmaster_recv_cb(struct ctdb_client_control_state *state)
-{
-       struct ctdb_control_cb_data *cb_data = state->async.private_data;
-       ctdb_getrecmaster_cb callback = (ctdb_getrecmaster_cb)cb_data->callback;
-
-       if (state->state != CTDB_CONTROL_DONE) {
-               DEBUG(DEBUG_ERR, (__location__ " ctdb_getrecmaster_recv_cb failed with state:%d\n", state->state));
-               callback(-1, 0, cb_data->private_data);
-               return;
-       }
-
-       callback(0, state->status, cb_data->private_data);
-}
-
 ctdb_handle *
 ctdb_getrecmaster_send(struct ctdb_context *ctdb,
-                       uint32_t destnode,
-                       ctdb_getrecmaster_cb callback,
-                       void *private_data)
+                       uint32_t destnode)
 {
        struct ctdb_client_control_state *state;
-       struct ctdb_control_cb_data *cb_data;
 
        state = ctdb_control_send(ctdb, destnode, 0, 
                           CTDB_CONTROL_GET_RECMASTER, 0, tdb_null, 
@@ -325,15 +307,6 @@ ctdb_getrecmaster_send(struct ctdb_context *ctdb,
                return NULL;
        }
 
-       if (callback != NULL) {
-               cb_data = talloc(state, struct ctdb_control_cb_data);
-               cb_data->callback     = callback;
-               cb_data->private_data = private_data;
-
-               state->async.fn           = ctdb_getrecmaster_recv_cb;
-               state->async.private_data = cb_data;
-       }
-
        return (ctdb_handle *)state;
 }
 
@@ -341,16 +314,15 @@ int ctdb_getrecmaster_recv(struct ctdb_context *ctdb, ctdb_handle *handle, uint3
 {
        struct ctdb_client_control_state *state = talloc_get_type(handle, struct ctdb_client_control_state);
        int ret;
-       int32_t res;
 
-       ret = ctdb_control_recv(ctdb, state, state, NULL, &res, NULL);
+       ret = ctdb_control_recv(ctdb, state, state, NULL, NULL, NULL);
        if (ret != 0) {
                DEBUG(DEBUG_ERR,(__location__ " ctdb_getrecmaster_recv failed\n"));
                return -1;
        }
 
        if (recmaster != NULL) {
-               *recmaster = (uint32_t)res;
+               *recmaster = (uint32_t)state->status;
        }
 
        return 0;
@@ -360,7 +332,7 @@ int ctdb_getrecmaster(struct ctdb_context *ctdb, uint32_t destnode, uint32_t *re
 {
        struct ctdb_client_control_state *state;
        
-       state = ctdb_getrecmaster_send(ctdb, destnode, NULL, NULL);
+       state = ctdb_getrecmaster_send(ctdb, destnode);
        if (state == NULL) {
                DEBUG(DEBUG_ERR,(__location__ " ctdb_getrecmaster_send() failed.\n"));
                return -1;