ctdb-daemon: Rename struct ctdb_ban_time to ctdb_ban_state

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

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 7ab0545a56a874ac5bf570835ae97593156eb2b3..9d465f2a99646ee21a5d5c1f8e351acaa6812a87 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -4709,7 +4709,8 @@ int ctdb_ctrl_disablescript(struct ctdb_context *ctdb, struct timeval timeout, u
 }
 
 
-int ctdb_ctrl_set_ban(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, struct ctdb_ban_time *bantime)
+int ctdb_ctrl_set_ban(struct ctdb_context *ctdb, struct timeval timeout,
+                     uint32_t destnode, struct ctdb_ban_state *bantime)
 {
        int ret;
        TDB_DATA data;
@@ -4730,7 +4731,9 @@ int ctdb_ctrl_set_ban(struct ctdb_context *ctdb, struct timeval timeout, uint32_
 }
 
 
-int ctdb_ctrl_get_ban(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, TALLOC_CTX *mem_ctx, struct ctdb_ban_time **bantime)
+int ctdb_ctrl_get_ban(struct ctdb_context *ctdb, struct timeval timeout,
+                     uint32_t destnode, TALLOC_CTX *mem_ctx,
+                     struct ctdb_ban_state **bantime)
 {
        int ret;
        TDB_DATA outdata;
@@ -4746,7 +4749,7 @@ int ctdb_ctrl_get_ban(struct ctdb_context *ctdb, struct timeval timeout, uint32_
                return -1;
        }
 
-       *bantime = (struct ctdb_ban_time *)talloc_steal(mem_ctx, outdata.dptr);
+       *bantime = (struct ctdb_ban_state *)talloc_steal(mem_ctx, outdata.dptr);
        talloc_free(tmp_ctx);
 
        return 0;

diff --git a/ctdb/include/ctdb_client.h b/ctdb/include/ctdb_client.h
index 2138b916f59a87df83113691521d279649760390..6540780f77bf4ab61b4c1cd046ae3b7d96456c04 100644 (file)
--- a/ctdb/include/ctdb_client.h
+++ b/ctdb/include/ctdb_client.h
@@ -601,10 +601,10 @@ int ctdb_ctrl_disablescript(struct ctdb_context *ctdb, struct timeval timeout,
                            uint32_t destnode, const char *script);
 
 int ctdb_ctrl_set_ban(struct ctdb_context *ctdb, struct timeval timeout,
-                     uint32_t destnode, struct ctdb_ban_time *bantime);
+                     uint32_t destnode, struct ctdb_ban_state *bantime);
 int ctdb_ctrl_get_ban(struct ctdb_context *ctdb, struct timeval timeout,
                      uint32_t destnode, TALLOC_CTX *mem_ctx,
-                     struct ctdb_ban_time **bantime);
+                     struct ctdb_ban_state **bantime);
 
 int ctdb_ctrl_set_db_priority(struct ctdb_context *ctdb,
                              struct timeval timeout, uint32_t destnode,

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index 82910ebaffdcb0139c98aac307b2ad28751a128f..316e1e5f972fcde9ed202ad2d909bc037a4a167e 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -813,7 +813,7 @@ struct ctdb_connection {
        ctdb_sock_addr dst;
 };
 
-struct ctdb_ban_time {
+struct ctdb_ban_state {
        uint32_t pnn;
        uint32_t time;
 };

diff --git a/ctdb/server/ctdb_banning.c b/ctdb/server/ctdb_banning.c
index ed85076172ea173ef1175fb4fe472a7ef438b138..d43e89c26ef0491747683e494f4b6c77e64eb323 100644 (file)
--- a/ctdb/server/ctdb_banning.c
+++ b/ctdb/server/ctdb_banning.c
@@ -81,7 +81,7 @@ void ctdb_local_node_got_banned(struct ctdb_context *ctdb)
 
 int32_t ctdb_control_set_ban_state(struct ctdb_context *ctdb, TDB_DATA indata)
 {
-       struct ctdb_ban_time *bantime = (struct ctdb_ban_time *)indata.dptr;
+       struct ctdb_ban_state *bantime = (struct ctdb_ban_state *)indata.dptr;
        bool already_banned;
 
        DEBUG(DEBUG_INFO,("SET BAN STATE\n"));
@@ -128,12 +128,12 @@ int32_t ctdb_control_set_ban_state(struct ctdb_context *ctdb, TDB_DATA indata)
                return 0;
        }
 
-       ctdb->banning_ctx = talloc(ctdb, struct ctdb_ban_time);
+       ctdb->banning_ctx = talloc(ctdb, struct ctdb_ban_state);
        if (ctdb->banning_ctx == NULL) {
                DEBUG(DEBUG_CRIT,(__location__ " ERROR Failed to allocate new banning state\n"));
                return -1;
        }
-       *((struct ctdb_ban_time *)(ctdb->banning_ctx)) = *bantime;
+       *((struct ctdb_ban_state *)(ctdb->banning_ctx)) = *bantime;
 
 
        DEBUG(DEBUG_ERR,("Banning this node for %d seconds\n", bantime->time));
@@ -151,20 +151,20 @@ int32_t ctdb_control_set_ban_state(struct ctdb_context *ctdb, TDB_DATA indata)
 
 int32_t ctdb_control_get_ban_state(struct ctdb_context *ctdb, TDB_DATA *outdata)
 {
-       struct ctdb_ban_time *bantime;
+       struct ctdb_ban_state *bantime;
 
-       bantime = talloc(outdata, struct ctdb_ban_time);
+       bantime = talloc(outdata, struct ctdb_ban_state);
        CTDB_NO_MEMORY(ctdb, bantime);
 
        if (ctdb->banning_ctx != NULL) {
-               *bantime = *(struct ctdb_ban_time *)(ctdb->banning_ctx);
+               *bantime = *(struct ctdb_ban_state *)(ctdb->banning_ctx);
        } else {
                bantime->pnn = ctdb->pnn;
                bantime->time = 0;
        }
 
        outdata->dptr  = (uint8_t *)bantime;
-       outdata->dsize = sizeof(struct ctdb_ban_time);
+       outdata->dsize = sizeof(struct ctdb_ban_state);
 
        return 0;
 }
@@ -173,7 +173,7 @@ int32_t ctdb_control_get_ban_state(struct ctdb_context *ctdb, TDB_DATA *outdata)
 void ctdb_ban_self(struct ctdb_context *ctdb)
 {
        TDB_DATA data;
-       struct ctdb_ban_time bantime;
+       struct ctdb_ban_state bantime;
 
        bantime.pnn  = ctdb->pnn;
        bantime.time = ctdb->tunable.recovery_ban_period;

diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index 2dc64f80be230af53fe0b94b9f989790c4ce5556..1ba1ef796eefee21c25a32595dd915b9368baabb 100644 (file)
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -604,7 +604,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
                return ctdb_control_disable_script(ctdb, indata);
 
        case CTDB_CONTROL_SET_BAN_STATE:
-               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_ban_time));
+               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_ban_state));
                return ctdb_control_set_ban_state(ctdb, indata);
 
        case CTDB_CONTROL_GET_BAN_STATE:

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index e1f580a4fb2bc9114e3a078e67ce0c005977b476..5a6fadab29c21784dcecc1cd20db273155210183 100644 (file)
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -267,8 +267,8 @@ static void ctdb_ban_node(struct ctdb_recoverd *rec, uint32_t pnn, uint32_t ban_
 {
        int ret;
        struct ctdb_context *ctdb = rec->ctdb;
-       struct ctdb_ban_time bantime;
-       
+       struct ctdb_ban_state bantime;
+
        if (!ctdb_validate_pnn(ctdb, pnn)) {
                DEBUG(DEBUG_ERR,("Bad pnn %u in ctdb_ban_node\n", pnn));
                return;

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 2c148b02ce4cba8b3edc6c8cb5e74d8889f536f3..521336636d1f8f2f243b1d08c848edb321a49365 100644 (file)
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -3420,7 +3420,7 @@ static uint32_t get_generation(struct ctdb_context *ctdb)
 /* Ban a node */
 static bool update_state_banned(struct ctdb_context *ctdb, void *data)
 {
-       struct ctdb_ban_time *bantime = (struct ctdb_ban_time *)data;
+       struct ctdb_ban_state *bantime = (struct ctdb_ban_state *)data;
        int ret;
 
        ret = ctdb_ctrl_set_ban(ctdb, TIMELIMIT(), options.pnn, bantime);
@@ -3430,7 +3430,7 @@ static bool update_state_banned(struct ctdb_context *ctdb, void *data)
 
 static int control_ban(struct ctdb_context *ctdb, int argc, const char **argv)
 {
-       struct ctdb_ban_time bantime;
+       struct ctdb_ban_state bantime;
 
        if (argc < 1) {
                usage();
@@ -3455,7 +3455,7 @@ static int control_ban(struct ctdb_context *ctdb, int argc, const char **argv)
 /* Unban a node */
 static int control_unban(struct ctdb_context *ctdb, int argc, const char **argv)
 {
-       struct ctdb_ban_time bantime;
+       struct ctdb_ban_state bantime;
 
        bantime.pnn  = options.pnn;
        bantime.time = 0;
@@ -3474,7 +3474,7 @@ static int control_showban(struct ctdb_context *ctdb, int argc, const char **arg
 {
        int ret;
        struct ctdb_node_map_old *nodemap=NULL;
-       struct ctdb_ban_time *bantime;
+       struct ctdb_ban_state *bantime;
 
        /* verify the node exists */
        ret = ctdb_ctrl_getnodemap(ctdb, TIMELIMIT(), CTDB_CURRENT_NODE, ctdb, &nodemap);