diff options
| author | Martin Schwenke <martin@meltin.net> | 2021-07-11 20:40:10 +1000 |
|---|---|---|
| committer | Jule Anger <janger@samba.org> | 2021-09-13 11:47:10 +0000 |
| commit | f8fa33ac320a22dcac34f09bbea35af1aa804dfc (patch) | |
| tree | 8ffc5a903961478d6b159d82c739dc1acc91e9f1 /ctdb | |
| parent | bddd7db7b2f8f238ae2d7222cc5bbd63545f0eba (diff) | |
| download | samba-f8fa33ac320a22dcac34f09bbea35af1aa804dfc.tar.gz | |
ctdb-recoverd: Add a helper variable
Improves readability and simplifies subsequent changes.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14784
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 82a075d4d734588a42fca7ebaf529892d1eba853)
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 4ba8729b50e..9e084486036 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -553,13 +553,14 @@ static int update_flags(struct ctdb_recoverd *rec, for (j=0; j<nodemap->num; j++) { struct ctdb_node_map_old *remote_nodemap=NULL; uint32_t local_flags = nodemap->nodes[j].flags; + uint32_t remote_pnn = nodemap->nodes[j].pnn; uint32_t remote_flags; int ret; if (local_flags & NODE_FLAGS_DISCONNECTED) { continue; } - if (nodemap->nodes[j].pnn == ctdb->pnn) { + if (remote_pnn == ctdb->pnn) { continue; } @@ -568,7 +569,7 @@ static int update_flags(struct ctdb_recoverd *rec, if (local_flags != remote_flags) { ret = update_flags_on_all_nodes(rec, - nodemap->nodes[j].pnn, + remote_pnn, remote_flags); if (ret != 0) { DBG_ERR( @@ -583,7 +584,7 @@ static int update_flags(struct ctdb_recoverd *rec, */ D_NOTICE("Remote node %u had flags 0x%x, " "local had 0x%x - updating local\n", - nodemap->nodes[j].pnn, + remote_pnn, remote_flags, local_flags); nodemap->nodes[j].flags = remote_flags; |