From: Martin Schwenke <martin@meltin.net>
Date: Tue, 14 Jul 2020 04:29:09 +0000 (+1000)
Subject: ctdb-recoverd: Simplify calculation of new flags
X-Git-Tag: samba-4.11.14~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=660f584477adb523a5f4849fe23610d816b63a54;p=thirdparty%2Fsamba.git

ctdb-recoverd: Simplify calculation of new flags

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Fri Jul 24 06:03:23 UTC 2020 on sn-devel-184

(cherry picked from commit 5ce6133a75107abdcb9fcfd93bc7594812dc5055)
---

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index a480f7fa90e..597907361c1 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -456,9 +456,7 @@ static int update_flags_on_all_nodes(struct ctdb_recoverd *rec,
 
 	c.pnn       = pnn;
 	c.old_flags = nodemap->nodes[i].flags;
-	c.new_flags = c.old_flags;
-	c.new_flags |= flags;
-	c.new_flags &= flags;
+	c.new_flags = flags;
 
 	data.dsize = sizeof(c);
 	data.dptr = (unsigned char *)&c;