diff options
| author | Michael Adam <obnox@samba.org> | 2013-04-19 15:55:38 +0200 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-04-24 18:48:47 +1000 |
| commit | ce0916f61b0ad68d9838e64f89d606853e2efc26 (patch) | |
| tree | eee9718d90e95290bcdeefd983536d6daee5f499 /ctdb | |
| parent | 1aa09dd5c3abe5bf67b268e50505d8fa26b7e8ad (diff) | |
| download | samba-ce0916f61b0ad68d9838e64f89d606853e2efc26.tar.gz samba-ce0916f61b0ad68d9838e64f89d606853e2efc26.tar.xz samba-ce0916f61b0ad68d9838e64f89d606853e2efc26.zip | |
ltdb_server: use CTDB_REC_RO_FLAGS where appropriate
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-By: Amitay Isaacs <amitay@gmail.com>
(This used to be ctdb commit 61f17e53576197def46bc61fdf0cdb5282333a3e)
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/ctdb_ltdb_server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c index c5d9be1782b..4f77934f0d8 100644 --- a/ctdb/server/ctdb_ltdb_server.c +++ b/ctdb/server/ctdb_ltdb_server.c @@ -82,7 +82,7 @@ static int ctdb_ltdb_store_server(struct ctdb_db_context *ctdb_db, */ if (data.dsize != 0) { keep = true; - } else if (header->flags & (CTDB_REC_RO_HAVE_DELEGATIONS|CTDB_REC_RO_HAVE_READONLY|CTDB_REC_RO_REVOKING_READONLY|CTDB_REC_RO_REVOKE_COMPLETE)) { + } else if (header->flags & CTDB_REC_RO_FLAGS) { keep = true; } else if (ctdb_db->persistent) { keep = true; @@ -127,7 +127,7 @@ static int ctdb_ltdb_store_server(struct ctdb_db_context *ctdb_db, if (keep) { if (!ctdb_db->persistent && (ctdb_db->ctdb->pnn == header->dmaster) && - !(header->flags & (CTDB_REC_RO_HAVE_DELEGATIONS|CTDB_REC_RO_HAVE_READONLY|CTDB_REC_RO_REVOKING_READONLY|CTDB_REC_RO_REVOKE_COMPLETE))) + !(header->flags & CTDB_REC_RO_FLAGS)) { header->rsn++; |