Import from SAMBA tdb:

[ccan] / ccan / tdb / transaction.c

diff --git a/ccan/tdb/transaction.c b/ccan/tdb/transaction.c
index 1086c5f037793d9df00269ff78b14ae2ad126e72..0944bb36e98a6a3af4e32ac2052e512483bc4311 100644 (file)
--- a/ccan/tdb/transaction.c
+++ b/ccan/tdb/transaction.c
@@ -127,6 +127,9 @@ struct tdb_transaction {
 
        /* old file size before transaction */
        tdb_len_t old_map_size;
+
+       /* we should re-pack on commit */
+       bool need_repack;
 };
 
 
@@ -397,6 +400,8 @@ static int transaction_expand_file(struct tdb_context *tdb, tdb_off_t size,
                return -1;
        }
 
+       tdb->transaction->need_repack = true;
+
        return 0;
 }
 
@@ -993,6 +998,7 @@ int tdb_transaction_commit(struct tdb_context *tdb)
 {      
        const struct tdb_methods *methods;
        int i;
+       bool need_repack;
 
        if (tdb->transaction == NULL) {
                TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_commit: no transaction\n"));
@@ -1092,10 +1098,16 @@ int tdb_transaction_commit(struct tdb_context *tdb)
        utime(tdb->name, NULL);
 #endif
 
+       need_repack = tdb->transaction->need_repack;
+
        /* use a transaction cancel to free memory and remove the
           transaction locks */
        tdb_transaction_cancel_internal(tdb);
 
+       if (need_repack) {
+               return tdb_repack(tdb);
+       }
+
        return 0;
 }