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 a480f7fa90edbc4c0506ace15b32a76c31bc1e7b..597907361c13b417e4fec401d2018b864945d04e 100644 (file)
--- 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;