From: Martin Schwenke <martin@meltin.net>
Date: Sun, 11 Jul 2021 10:40:10 +0000 (+1000)
Subject: ctdb-recoverd: Add a helper variable
X-Git-Tag: ldb-2.5.0~751
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82a075d4d734588a42fca7ebaf529892d1eba853;p=thirdparty%2Fsamba.git

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>
---

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;