sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

ctdb-recoverd: Drop unused nodemap argument from update_flags_on_all_nodes()

Browse Source 
An unused argument needlessly extends the length of function calls.  A
subsequent change will allow rec->nodemap to be used if necessary.

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 20:25:07 +11:00 committed by Martin Schwenke
parent 484a764e83
commit 6982fcb3e6
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ctdb/server/ctdb_recoverd.c
View File

@ -425,9 +425,11 @@ static int set_recovery_mode(struct ctdb_context *ctdb,
} }
/* /*
update flags on all active nodes * Update flags on all connected nodes
*/ */
static int update_flags_on_all_nodes(struct ctdb_context *ctdb, struct ctdb_node_map_old *nodemap, uint32_t pnn, uint32_t flags) static int update_flags_on_all_nodes(struct ctdb_context *ctdb,
uint32_t pnn,
uint32_t flags)
{ {
int ret; int ret;
@ -1125,7 +1127,9 @@ static int do_recovery(struct ctdb_recoverd *rec,
continue; continue;
} }
ret = update_flags_on_all_nodes(ctdb, nodemap, i, nodemap->nodes[i].flags); ret = update_flags_on_all_nodes(ctdb,
i,
nodemap->nodes[i].flags);
if (ret != 0) { if (ret != 0) {
if (nodemap->nodes[i].flags & NODE_FLAGS_INACTIVE) { if (nodemap->nodes[i].flags & NODE_FLAGS_INACTIVE) {
DEBUG(DEBUG_WARNING, (__location__ "Unable to update flags on inactive node %d\n", i)); DEBUG(DEBUG_WARNING, (__location__ "Unable to update flags on inactive node %d\n", i));
@ -2610,14 +2614,20 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec,
nodemap->nodes[i].flags)); nodemap->nodes[i].flags));
if (i == j) { if (i == j) {
DEBUG(DEBUG_ERR,("Use flags 0x%02x from remote node %d for cluster update of its own flags\n", remote_nodemaps[j]->nodes[i].flags, j)); DEBUG(DEBUG_ERR,("Use flags 0x%02x from remote node %d for cluster update of its own flags\n", remote_nodemaps[j]->nodes[i].flags, j));
update_flags_on_all_nodes(ctdb, nodemap, nodemap->nodes[i].pnn, remote_nodemaps[j]->nodes[i].flags); update_flags_on_all_nodes(
ctdb,
nodemap->nodes[i].pnn,
remote_nodemaps[j]->nodes[i].flags);
ctdb_set_culprit(rec, nodemap->nodes[j].pnn); ctdb_set_culprit(rec, nodemap->nodes[j].pnn);
do_recovery(rec, mem_ctx, pnn, nodemap, do_recovery(rec, mem_ctx, pnn, nodemap,
vnnmap); vnnmap);
return; return;
} else { } else {
DEBUG(DEBUG_ERR,("Use flags 0x%02x from local recmaster node for cluster update of node %d flags\n", nodemap->nodes[i].flags, i)); DEBUG(DEBUG_ERR,("Use flags 0x%02x from local recmaster node for cluster update of node %d flags\n", nodemap->nodes[i].flags, i));
update_flags_on_all_nodes(ctdb, nodemap, nodemap->nodes[i].pnn, nodemap->nodes[i].flags); update_flags_on_all_nodes(
ctdb,
nodemap->nodes[i].pnn,
nodemap->nodes[i].flags);
ctdb_set_culprit(rec, nodemap->nodes[j].pnn); ctdb_set_culprit(rec, nodemap->nodes[j].pnn);
do_recovery(rec, mem_ctx, pnn, nodemap, do_recovery(rec, mem_ctx, pnn, nodemap,
vnnmap); vnnmap);