From: Andrew Tridgell Date: Sat, 28 Apr 2007 15:46:37 +0000 (+0200) Subject: better name for this hack X-Git-Tag: tevent-0.9.20~348^2~2814 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e538be42d5f7e9fb76fed55d6ad3a9f70b261a7;p=thirdparty%2Fsamba.git 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 e2cc6bfe697..a75f1d970b4 100644 --- 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 __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; diff --git a/ctdb/tools/ctdb_control.c b/ctdb/tools/ctdb_control.c index 601a8cb5514..45743b36c6a 100644 --- 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 = - 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]);