twom: neater check code

cyrusimap · Jan 6, 2025 · 27ac4cc · 27ac4cc
1 parent 2e909d3
commit 27ac4cc
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/cyrusdb_twom.c b/lib/cyrusdb_twom.c
@@ -2000,10 +2000,10 @@ static int mycheckpoint(struct dbengine *db)
     r = opendb(newfname, flags, &cr.db, &cr.tid);
     if (r) return r;
 
-    // has it already repacked?
-    if (cr.db->openfile->header.num_records ||
-        cr.db->openfile->header.generation > 1 ||
-        !memcmp(cr.db->openfile->header.uuid, db->openfile->header.uuid, 16)) {
+    // did we lose the race? (same uuid, higher generation, records exist)
+    if (!memcmp(cr.db->openfile->header.uuid, db->openfile->header.uuid, 16)
+        || cr.db->openfile->header.generation > 1
+        || cr.db->openfile->header.num_records) {
         r = myabort(cr.db, cr.tid);
         if (r) goto err;
         myclose(cr.db);