vacuum: use CTDB_REC_RO_FLAGS in the vacuuming code
authorMichael Adam <obnox@samba.org>
Fri, 19 Apr 2013 14:09:34 +0000 (16:09 +0200)
committerAmitay Isaacs <amitay@gmail.com>
Wed, 24 Apr 2013 08:48:53 +0000 (18:48 +1000)
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-By: Amitay Isaacs <amitay@gmail.com>
server/ctdb_vacuum.c

index 8343da8d997b1c3866405eeed2531f4b8c10a591..d7527d4da1a12591715ef137a58d471c1e61ea26 100644 (file)
@@ -360,11 +360,7 @@ static int delete_marshall_traverse_first(void *param, void *data)
 
        header = (struct ctdb_ltdb_header *)tdb_data.dptr;
 
-       if (header->flags & (CTDB_REC_RO_HAVE_DELEGATIONS|
-                            CTDB_REC_RO_HAVE_READONLY|
-                            CTDB_REC_RO_REVOKING_READONLY|
-                            CTDB_REC_RO_REVOKE_COMPLETE))
-       {
+       if (header->flags & CTDB_REC_RO_FLAGS) {
                DEBUG(DEBUG_INFO, (__location__ ": record with hash [0x%08x] "
                                   "on database db[%s] has read-only flags. "
                                   "skipping.\n",
@@ -637,11 +633,7 @@ static int delete_record_traverse(void *param, void *data)
 
        header = (struct ctdb_ltdb_header *)tdb_data.dptr;
 
-       if (header->flags & (CTDB_REC_RO_HAVE_DELEGATIONS|
-                            CTDB_REC_RO_HAVE_READONLY|
-                            CTDB_REC_RO_REVOKING_READONLY|
-                            CTDB_REC_RO_REVOKE_COMPLETE))
-       {
+       if (header->flags & CTDB_REC_RO_FLAGS) {
                DEBUG(DEBUG_INFO, (__location__ ": record with hash [0x%08x] "
                                   "on database db[%s] has read-only flags. "
                                   "skipping.\n",