diff options
| author | Martin Schwenke <martin@meltin.net> | 2020-07-14 14:29:09 +1000 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2020-08-25 11:27:17 +0000 |
| commit | 5f0f32ab639e15752eca79463d8d7bccaf08222c (patch) | |
| tree | 020eae4c95403b33cde1dc03b6cb9267d8f5d9ad /ctdb | |
| parent | 442d6b0b66e839ea4240fadb8a1dbc348cfb123d (diff) | |
| download | samba-5f0f32ab639e15752eca79463d8d7bccaf08222c.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
(cherry picked from commit 5ce6133a75107abdcb9fcfd93bc7594812dc5055)
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 4 |
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; |