better name for this hack

(This used to be ctdb commit e5a98eee991a7926ddb6964ea3785b11303d175e)

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index e2cc6bfe697c5d12f352c50ba21e0fab489d7e00..a75f1d970b4925691864f5a2911d48f979c41b41 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -157,7 +157,7 @@ struct ctdb_status {
        uint32_t pending_calls;
        uint32_t lockwait_calls;
        uint32_t pending_lockwait_calls;
        uint32_t pending_calls;
        uint32_t lockwait_calls;
        uint32_t pending_lockwait_calls;

-       uint32_t __last_uint32; /* hack for control_status_all */
+       uint32_t __last_counter; /* hack for control_status_all */

        uint32_t max_redirect_count;
        double max_call_latency;
        double max_lockwait_latency;
        uint32_t max_redirect_count;
        double max_call_latency;
        double max_lockwait_latency;

diff --git a/ctdb/tools/ctdb_control.c b/ctdb/tools/ctdb_control.c
index 601a8cb5514811ba134401056cd588f8631389cc..45743b36c6a2f515061660ee6374135a861b4321 100644 (file)
--- a/ctdb/tools/ctdb_control.c
+++ b/ctdb/tools/ctdb_control.c
@@ -126,7 +126,7 @@ static int control_status_all(struct ctdb_context *ctdb)
                uint32_t *v1 = (uint32_t *)&s1;
                uint32_t *v2 = (uint32_t *)&status;
                uint32_t num_ints = 
                uint32_t *v1 = (uint32_t *)&s1;
                uint32_t *v2 = (uint32_t *)&status;
                uint32_t num_ints = 

-                       offsetof(struct ctdb_status, __last_uint32) / sizeof(uint32_t);
+                       offsetof(struct ctdb_status, __last_counter) / sizeof(uint32_t);

                ret = ctdb_status(ctdb, nodes[i], &s1);
                if (ret != 0) {
                        printf("Unable to get status from node %u\n", nodes[i]);
                ret = ctdb_status(ctdb, nodes[i], &s1);
                if (ret != 0) {
                        printf("Unable to get status from node %u\n", nodes[i]);