X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftransaction.c;h=a27c027365eec3fc7be001d9693bde42ec6f0b45;hb=a8b30ad4dcea31c68ca809d2a6e6e4c7c6c30398;hp=dd2f0e2507d095cb367ca06f865baea26d6ed1a2;hpb=72e974b25a04a72a1123501aafbb3b5d39019d42;p=ccan

diff --git a/ccan/tdb2/transaction.c b/ccan/tdb2/transaction.c
index dd2f0e25..a27c0273 100644
--- a/ccan/tdb2/transaction.c
+++ b/ccan/tdb2/transaction.c
@@ -688,7 +688,8 @@ static enum TDB_ERROR tdb_recovery_allocate(struct tdb_context *tdb,
 	if (recovery_head != 0) {
 		tdb->stats.frees++;
 		ecode = add_free_record(tdb, recovery_head,
-					sizeof(rec) + rec.max_len);
+					sizeof(rec) + rec.max_len,
+					TDB_LOCK_WAIT);
 		if (ecode != TDB_SUCCESS) {
 			return tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
 					  "tdb_recovery_allocate:"
@@ -700,10 +701,11 @@ static enum TDB_ERROR tdb_recovery_allocate(struct tdb_context *tdb,
 	/* the tdb_free() call might have increased the recovery size */
 	*recovery_size = tdb_recovery_size(tdb);
 
-	/* round up to a multiple of page size */
+	/* round up to a multiple of page size. Overallocate, since each
+	 * such allocation forces us to expand the file. */
 	*recovery_max_size
-		= (((sizeof(rec) + *recovery_size) + PAGESIZE-1)
-		   & ~(PAGESIZE-1))
+		= (((sizeof(rec) + *recovery_size + *recovery_size / 2)
+		    + PAGESIZE-1) & ~(PAGESIZE-1))
 		- sizeof(rec);
 	*recovery_offset = tdb->file->map_size;
 	recovery_head = *recovery_offset;