ctdb-daemon: Rename struct ctdb_server_id_list to ctdb_client_id_list_old

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 cc96eb57fd614ccdf1a1b0548135ccd3ba28acfa..ec83cea3bb6f44211cc1d891e92770c50d26cf4a 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -3292,9 +3292,9 @@ int ctdb_ctrl_check_server_id(struct ctdb_context *ctdb,
    get the list of server ids that are registered on a node
 */
 int ctdb_ctrl_get_server_id_list(struct ctdb_context *ctdb,
-               TALLOC_CTX *mem_ctx,
-               struct timeval timeout, uint32_t destnode, 
-               struct ctdb_server_id_list **svid_list)
+                                TALLOC_CTX *mem_ctx,
+                                struct timeval timeout, uint32_t destnode,
+                                struct ctdb_client_id_list_old **svid_list)
 {
        int ret;
        TDB_DATA outdata;
@@ -3308,8 +3308,8 @@ int ctdb_ctrl_get_server_id_list(struct ctdb_context *ctdb,
                return -1;
        }
 
-       *svid_list = (struct ctdb_server_id_list *)talloc_steal(mem_ctx, outdata.dptr);
-                   
+       *svid_list = (struct ctdb_client_id_list_old *)talloc_steal(mem_ctx, outdata.dptr);
+
        return 0;
 }
 

diff --git a/ctdb/include/ctdb_client.h b/ctdb/include/ctdb_client.h
index d5ca55b36408a12c960bbe709c7c629f9b820730..cf3203a34ac434d02f1fdf5c4335a652200fd2eb 100644 (file)
--- a/ctdb/include/ctdb_client.h
+++ b/ctdb/include/ctdb_client.h
@@ -431,7 +431,7 @@ int ctdb_ctrl_check_server_id(struct ctdb_context *ctdb,
 int ctdb_ctrl_get_server_id_list(struct ctdb_context *ctdb,
                                 TALLOC_CTX *mem_ctx,
                                 struct timeval timeout, uint32_t destnode,
-                                struct ctdb_server_id_list **svid_list);
+                                struct ctdb_client_id_list_old **svid_list);
 
 /*
   initialise ctdb subsystem

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index 9accc587368f3dd4145fe3f48e70b0a205e67f29..94b80f3a0d24713c0d9d898370d21ff2f185f2e0 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -796,7 +796,7 @@ struct ctdb_client_id {
        uint32_t server_id;
 };
 
-struct ctdb_server_id_list {
+struct ctdb_client_id_list_old {
        uint32_t num;
        struct ctdb_client_id server_ids[1];
 };

diff --git a/ctdb/server/ctdb_serverids.c b/ctdb/server/ctdb_serverids.c
index fd8738ae0e41bd364624969461e91089df8d4ec9..b209d3616cd1353aeec6db398ae47b6a2a6bea9a 100644 (file)
--- a/ctdb/server/ctdb_serverids.c
+++ b/ctdb/server/ctdb_serverids.c
@@ -126,7 +126,7 @@ int32_t ctdb_control_unregister_server_id(struct ctdb_context *ctdb,
 
 struct count_server_ids {
        int count;
-       struct ctdb_server_id_list *list;
+       struct ctdb_client_id_list_old *list;
 };
 
 static int server_id_count(void *param, void *data)
@@ -182,15 +182,14 @@ int32_t ctdb_control_get_server_id_list(struct ctdb_context *ctdb, TDB_DATA *out
                        server_id_count, svid);
 
 
-       outdata->dsize = offsetof(struct ctdb_server_id_list, 
-                               server_ids)
+       outdata->dsize = offsetof(struct ctdb_client_id_list_old, server_ids)
                        + sizeof(struct ctdb_client_id) * svid->count;
        outdata->dptr  = talloc_size(outdata, outdata->dsize);
        CTDB_NO_MEMORY(ctdb, outdata->dptr);
 
 
        /* now fill the structure in */
-       svid->list = (struct ctdb_server_id_list *)(outdata->dptr);
+       svid->list = (struct ctdb_client_id_list_old *)(outdata->dptr);
        svid->list->num = svid->count;
        svid->count=0;
        trbt_traversearray32(ctdb->server_ids, SERVER_ID_KEY_SIZE,

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 62577d9840907426bf015a345fe24c25de7961c0..ca0a7f5e4c72f06b10d986bd4442deb959b500ca 100644 (file)
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -2869,7 +2869,7 @@ static int chksrvid(struct ctdb_context *ctdb, int argc, const char **argv)
 static int getsrvids(struct ctdb_context *ctdb, int argc, const char **argv)
 {
        int i, ret;
-       struct ctdb_server_id_list *server_ids;
+       struct ctdb_client_id_list_old *server_ids;
 
        ret = ctdb_ctrl_get_server_id_list(ctdb, ctdb, TIMELIMIT(), options.pnn, &server_ids);
        if (ret != 0) {