summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2020-07-14 14:29:09 +1000
committerMartin Schwenke <martins@samba.org>2020-07-24 06:03:23 +0000
commit5ce6133a75107abdcb9fcfd93bc7594812dc5055 (patch)
tree4992bef49d3e60b22b5cd97da4158c3841ca7818
parent3654e416770cc7521dcc3c15976daeba37023304 (diff)
downloadsamba-5ce6133a75107abdcb9fcfd93bc7594812dc5055.tar.gz
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
-rw-r--r--ctdb/server/ctdb_recoverd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index be786adbc6c..3f72619127a 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;