sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

ctdb-recoverd: Move memory allocation into get_remote_nodemaps()

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14466
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-01-18 16:31:39 +11:00 committed by Amitay Isaacs
parent 3324dd272c
commit 2eaa0af616
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ctdb/server/ctdb_recoverd.c
View File

@ -2243,12 +2243,21 @@ static void async_getnodemap_callback(struct ctdb_context *ctdb,
static int get_remote_nodemaps(struct ctdb_recoverd *rec,
TALLOC_CTX *mem_ctx,
struct ctdb_node_map_old **remote_nodemaps)
struct ctdb_node_map_old ***remote_nodemaps)
{
struct ctdb_context *ctdb = rec->ctdb;
struct ctdb_node_map_old **t;
uint32_t *nodes;
int ret;
t = talloc_zero_array(mem_ctx,
struct ctdb_node_map_old *,
rec->nodemap->num);
if (t == NULL) {
DBG_ERR("Memory allocation error\n");
return -1;
}
nodes = list_of_active_nodes(ctdb, rec->nodemap, mem_ctx, true);
ret = ctdb_client_async_control(ctdb,
@ -2260,9 +2269,16 @@ static int get_remote_nodemaps(struct ctdb_recoverd *rec,
tdb_null,
async_getnodemap_callback,
NULL,
remote_nodemaps);
t);
talloc_free(nodes);
return ret;
if (ret != 0) {
talloc_free(t);
return ret;
}
*remote_nodemaps = t;
return 0;
}
static bool validate_recovery_master(struct ctdb_recoverd *rec,
@ -2584,15 +2600,7 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec,
/* get the nodemap for all active remote nodes
*/
remote_nodemaps = talloc_array(mem_ctx, struct ctdb_node_map_old *, nodemap->num);
if (remote_nodemaps == NULL) {
DEBUG(DEBUG_ERR, (__location__ " failed to allocate remote nodemap array\n"));
return;
}
for(i=0; i<nodemap->num; i++) {
remote_nodemaps[i] = NULL;
}
ret = get_remote_nodemaps(rec, mem_ctx, remote_nodemaps);
ret = get_remote_nodemaps(rec, mem_ctx, &remote_nodemaps);
if (ret != 0) {
DBG_ERR("Failed to read remote nodemaps\n");
return;