ctdb-daemon: Rename struct ctdb_control_set_tunable to ctdb_tunable_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 a1f1d378ab9e6f5565d4490f03ef88b2f29ea7cd..7fbb3471cbe2eb4d5ae4b704aeae4f4c3516f8cd 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -2693,16 +2693,16 @@ int ctdb_ctrl_set_tunable(struct ctdb_context *ctdb,
                          uint32_t destnode,
                          const char *name, uint32_t value)
 {
-       struct ctdb_control_set_tunable *t;
+       struct ctdb_tunable_old *t;
        TDB_DATA data;
        int32_t res;
        int ret;
 
-       data.dsize = offsetof(struct ctdb_control_set_tunable, name) + strlen(name) + 1;
+       data.dsize = offsetof(struct ctdb_tunable_old, name) + strlen(name) + 1;
        data.dptr  = talloc_size(ctdb, data.dsize);
        CTDB_NO_MEMORY(ctdb, data.dptr);
 
-       t = (struct ctdb_control_set_tunable *)data.dptr;
+       t = (struct ctdb_tunable_old *)data.dptr;
        t->length = strlen(name)+1;
        memcpy(t->name, name, t->length);
        t->value = value;

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index c7f31af9323ce4018ec2884c745dcd3c86684d43..7da0f33876b40d3e2ebf6bf37b84824ebf32a405 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -957,7 +957,7 @@ struct ctdb_marshall_buffer {
 /*
   structure for setting a tunable
  */
-struct ctdb_control_set_tunable {
+struct ctdb_tunable_old {
        uint32_t value;
        uint32_t length;
        uint8_t  name[1];

diff --git a/ctdb/server/ctdb_tunables.c b/ctdb/server/ctdb_tunables.c
index c333daefa1e91f2da66e85017b9f8adcff82f278..29c11ea625441ba3189ae4c8212eabea12693d31 100644 (file)
--- a/ctdb/server/ctdb_tunables.c
+++ b/ctdb/server/ctdb_tunables.c
@@ -154,13 +154,13 @@ int32_t ctdb_control_get_tunable(struct ctdb_context *ctdb, TDB_DATA indata,
  */
 int32_t ctdb_control_set_tunable(struct ctdb_context *ctdb, TDB_DATA indata)
 {
-       struct ctdb_control_set_tunable *t =
-               (struct ctdb_control_set_tunable *)indata.dptr;
+       struct ctdb_tunable_old *t =
+               (struct ctdb_tunable_old *)indata.dptr;
        char *name;
        int i;
 
        if (indata.dsize < sizeof(*t) ||
-           t->length > indata.dsize - offsetof(struct ctdb_control_set_tunable, name)) {
+           t->length > indata.dsize - offsetof(struct ctdb_tunable_old, name)) {
                DEBUG(DEBUG_ERR,("Bad indata in ctdb_control_set_tunable\n"));
                return -1;
        }