diff options
author | Amitay Isaacs <amitay@gmail.com> | 2015-10-29 14:32:49 +1100 |
---|---|---|
committer | Martin Schwenke <martins@samba.org> | 2015-11-04 00:47:15 +0100 |
commit | cf1ac77b3a96f2d9214e132a5a18966d31322880 (patch) | |
tree | bfb1bc6678a633480dc807e004b34e1d0680877a | |
parent | d4de4527b070ab0039ffdf7d2fdd3a105c198b5d (diff) | |
download | samba-cf1ac77b3a96f2d9214e132a5a18966d31322880.tar.gz |
ctdb-daemon: Rename struct srvid_request to ctdb_srvid_message
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
-rw-r--r-- | ctdb/include/ctdb_protocol.h | 2 | ||||
-rw-r--r-- | ctdb/server/ctdb_monitor.c | 2 | ||||
-rw-r--r-- | ctdb/server/ctdb_recoverd.c | 26 | ||||
-rw-r--r-- | ctdb/tools/ctdb.c | 4 |
4 files changed, 17 insertions, 17 deletions
diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h index 316e1e5f972..195fdc949f6 100644 --- a/ctdb/include/ctdb_protocol.h +++ b/ctdb/include/ctdb_protocol.h @@ -826,7 +826,7 @@ struct ctdb_db_priority { /* * Structures to support SRVID requests and replies */ -struct srvid_request { +struct ctdb_srvid_message { uint32_t pnn; uint64_t srvid; }; diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c index 50a3da45a17..ecf1f0d387e 100644 --- a/ctdb/server/ctdb_monitor.c +++ b/ctdb/server/ctdb_monitor.c @@ -126,7 +126,7 @@ static void ctdb_health_callback(struct ctdb_context *ctdb, int status, void *p) uint32_t next_interval; int ret; TDB_DATA rddata; - struct srvid_request rd; + struct ctdb_srvid_message rd; const char *state_str = NULL; c.pnn = ctdb->pnn; diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 5a6fadab29c..d918fc46bbf 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -45,7 +45,7 @@ /* List of SRVID requests that need to be processed */ struct srvid_list { struct srvid_list *next, *prev; - struct srvid_request *request; + struct ctdb_srvid_message *request; }; struct srvid_requests { @@ -53,7 +53,7 @@ struct srvid_requests { }; static void srvid_request_reply(struct ctdb_context *ctdb, - struct srvid_request *request, + struct ctdb_srvid_message *request, TDB_DATA result) { /* Someone that sent srvid==0 does not want a reply */ @@ -92,7 +92,7 @@ static void srvid_requests_reply(struct ctdb_context *ctdb, static void srvid_request_add(struct ctdb_context *ctdb, struct srvid_requests **requests, - struct srvid_request *request) + struct ctdb_srvid_message *request) { struct srvid_list *t; int32_t ret; @@ -114,7 +114,7 @@ static void srvid_request_add(struct ctdb_context *ctdb, goto nomem; } - t->request = (struct srvid_request *)talloc_steal(t, request); + t->request = (struct ctdb_srvid_message *)talloc_steal(t, request); DLIST_ADD((*requests)->requests, t); return; @@ -2542,14 +2542,14 @@ static void mem_dump_handler(uint64_t srvid, TDB_DATA data, void *private_data) TALLOC_CTX *tmp_ctx = talloc_new(ctdb); TDB_DATA *dump; int ret; - struct srvid_request *rd; + struct ctdb_srvid_message *rd; - if (data.dsize != sizeof(struct srvid_request)) { + if (data.dsize != sizeof(struct ctdb_srvid_message)) { DEBUG(DEBUG_ERR, (__location__ " Wrong size of return address.\n")); talloc_free(tmp_ctx); return; } - rd = (struct srvid_request *)data.dptr; + rd = (struct ctdb_srvid_message *)data.dptr; dump = talloc_zero(tmp_ctx, TDB_DATA); if (dump == NULL) { @@ -2709,7 +2709,7 @@ static void srvid_disable_and_reply(struct ctdb_context *ctdb, if (data.dsize != sizeof(struct srvid_request_data)) { DEBUG(DEBUG_ERR,(__location__ " Wrong size for data :%lu " "expecting %lu\n", (long unsigned)data.dsize, - (long unsigned)sizeof(struct srvid_request))); + (long unsigned)sizeof(struct ctdb_srvid_message))); return; } if (data.dptr == NULL) { @@ -2730,7 +2730,7 @@ static void srvid_disable_and_reply(struct ctdb_context *ctdb, done: result.dsize = sizeof(int32_t); result.dptr = (uint8_t *)&ret; - srvid_request_reply(ctdb, (struct srvid_request *)r, result); + srvid_request_reply(ctdb, (struct ctdb_srvid_message *)r, result); } static void disable_takeover_runs_handler(uint64_t srvid, TDB_DATA data, @@ -2783,16 +2783,16 @@ static void disable_recoveries_handler(uint64_t srvid, TDB_DATA data, static void ip_reallocate_handler(uint64_t srvid, TDB_DATA data, void *private_data) { - struct srvid_request *request; + struct ctdb_srvid_message *request; struct ctdb_recoverd *rec = talloc_get_type( private_data, struct ctdb_recoverd); - if (data.dsize != sizeof(struct srvid_request)) { + if (data.dsize != sizeof(struct ctdb_srvid_message)) { DEBUG(DEBUG_ERR, (__location__ " Wrong size of return address.\n")); return; } - request = (struct srvid_request *)data.dptr; + request = (struct ctdb_srvid_message *)data.dptr; srvid_request_add(rec->ctdb, &rec->reallocate_requests, request); } @@ -3431,7 +3431,7 @@ static int verify_local_ip_allocation(struct ctdb_context *ctdb, struct ctdb_rec } if (need_takeover_run) { - struct srvid_request rd; + struct ctdb_srvid_message rd; TDB_DATA data; DEBUG(DEBUG_CRIT,("Trigger takeoverrun\n")); diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index 521336636d1..b51a39dc9a4 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -2259,7 +2259,7 @@ static int srvid_broadcast(struct ctdb_context *ctdb, TDB_DATA data; uint32_t pnn; uint64_t reply_srvid; - struct srvid_request request; + struct ctdb_srvid_message request; struct srvid_request_data request_data; struct srvid_reply_handler_data reply_data; struct timeval tv; @@ -6066,7 +6066,7 @@ static int control_rddumpmemory(struct ctdb_context *ctdb, int argc, const char { int ret; TDB_DATA data; - struct srvid_request rd; + struct ctdb_srvid_message rd; rd.pnn = ctdb_get_pnn(ctdb); rd.srvid = getpid(); |