diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-11-12 15:16:49 +1100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-11-27 18:46:16 +0100 |
| commit | 028fe930b65bd97261eaf689d54ffeb3ea0746db (patch) | |
| tree | 3830facc3ff6c444f72cb32fc4b3849590e04b56 /ctdb/server | |
| parent | 4ab58a12a1895bb3be78e00045ff03ba65894ea5 (diff) | |
| download | samba-028fe930b65bd97261eaf689d54ffeb3ea0746db.tar.gz samba-028fe930b65bd97261eaf689d54ffeb3ea0746db.tar.xz samba-028fe930b65bd97261eaf689d54ffeb3ea0746db.zip | |
ctdb-recoverd: Fix backward compatibility for CTDB_SRVID_TAKEOVER_RUN
When running a mixed version cluster, compatibility with older
versions was was broken during recent refactorisation.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Pair-programmed-with: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'ctdb/server')
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index d5b36acc19..6820ec92f2 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -1652,7 +1652,7 @@ static bool do_takeover_run(struct ctdb_recoverd *rec, bool banning_credits_on_fail) { uint32_t *nodes = NULL; - struct srvid_request dtr; + struct srvid_request_data dtr; TDB_DATA data; int i; uint32_t *rebalance_nodes = rec->force_rebalance_nodes; @@ -2470,13 +2470,13 @@ static void disable_takeover_runs_handler(struct ctdb_context *ctdb, { struct ctdb_recoverd *rec = talloc_get_type(private_data, struct ctdb_recoverd); - struct srvid_request *r; + struct srvid_request_data *r; uint32_t timeout; TDB_DATA result; int32_t ret = 0; /* Validate input data */ - if (data.dsize != sizeof(struct srvid_request)) { + 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))); @@ -2487,7 +2487,7 @@ static void disable_takeover_runs_handler(struct ctdb_context *ctdb, return; } - r = (struct srvid_request *)data.dptr; + r = (struct srvid_request_data *)data.dptr; timeout = r->data; if (timeout == 0) { @@ -2537,7 +2537,7 @@ static void disable_takeover_runs_handler(struct ctdb_context *ctdb, done: result.dsize = sizeof(int32_t); result.dptr = (uint8_t *)&ret; - srvid_request_reply(ctdb, r, result); + srvid_request_reply(ctdb, (struct srvid_request *)r, result); } /* Backward compatibility for this SRVID - call @@ -2549,7 +2549,7 @@ static void disable_ip_check_handler(struct ctdb_context *ctdb, uint64_t srvid, struct ctdb_recoverd *rec = talloc_get_type(private_data, struct ctdb_recoverd); TDB_DATA data2; - struct srvid_request *req; + struct srvid_request_data *req; if (data.dsize != sizeof(uint32_t)) { DEBUG(DEBUG_ERR,(__location__ " Wrong size for data :%lu " @@ -2562,7 +2562,7 @@ static void disable_ip_check_handler(struct ctdb_context *ctdb, uint64_t srvid, return; } - req = talloc(ctdb, struct srvid_request); + req = talloc(ctdb, struct srvid_request_data); CTDB_NO_MEMORY_VOID(ctdb, req); req->srvid = 0; /* No reply */ |