ctdb-daemon: Rename takeover_callback_state -> release_ip_callback_state

Many years ago takeover_callback_state was used for both IP takeover
and release.  Now it is only used when releasing an IP so rename it to
improve clarity.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12158

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

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index ee4dbe1852cc4c084b814518ee12277fb62418fe..1883c30181573cfd15228d54d135eb3a81a59df1 100644 (file)
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -434,12 +434,6 @@ static int32_t ctdb_announce_vnn_iface(struct ctdb_context *ctdb,
        return 0;
 }
 
-struct takeover_callback_state {
-       struct ctdb_req_control_old *c;
-       ctdb_sock_addr *addr;
-       struct ctdb_vnn *vnn;
-};
-
 struct ctdb_do_takeip_state {
        struct ctdb_req_control_old *c;
        struct ctdb_vnn *vnn;
@@ -872,14 +866,20 @@ static struct ctdb_vnn *release_ip_post(struct ctdb_context *ctdb,
        return vnn;
 }
 
+struct release_ip_callback_state {
+       struct ctdb_req_control_old *c;
+       ctdb_sock_addr *addr;
+       struct ctdb_vnn *vnn;
+};
+
 /*
   called when releaseip event finishes
  */
-static void release_ip_callback(struct ctdb_context *ctdb, int status, 
+static void release_ip_callback(struct ctdb_context *ctdb, int status,
                                void *private_data)
 {
-       struct takeover_callback_state *state = 
-               talloc_get_type(private_data, struct takeover_callback_state);
+       struct release_ip_callback_state *state =
+               talloc_get_type(private_data, struct release_ip_callback_state);
 
        if (status == -ETIME) {
                ctdb_ban_self(ctdb);
@@ -904,7 +904,7 @@ static void release_ip_callback(struct ctdb_context *ctdb, int status,
        talloc_free(state);
 }
 
-static int ctdb_releaseip_destructor(struct takeover_callback_state *state)
+static int ctdb_releaseip_destructor(struct release_ip_callback_state *state)
 {
        if (state->vnn != NULL) {
                state->vnn->update_in_flight = false;
@@ -921,7 +921,7 @@ int32_t ctdb_control_release_ip(struct ctdb_context *ctdb,
                                bool *async_reply)
 {
        int ret;
-       struct takeover_callback_state *state;
+       struct release_ip_callback_state *state;
        struct ctdb_public_ip *pip = (struct ctdb_public_ip *)indata.dptr;
        struct ctdb_vnn *vnn;
        char *iface;
@@ -983,7 +983,7 @@ int32_t ctdb_control_release_ip(struct ctdb_context *ctdb,
                iface,
                pip->pnn));
 
-       state = talloc(ctdb, struct takeover_callback_state);
+       state = talloc(ctdb, struct release_ip_callback_state);
        if (state == NULL) {
                ctdb_set_error(ctdb, "Out of memory at %s:%d",
                               __FILE__, __LINE__);