X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftransaction.c;h=dd94510c027343d1c6aac0e6ec0d6e3d28ffeaab;hp=64bd5366ebeb03d72d58c4f3121d18e61b1cf2fe;hb=926996e88c32445c874ff9c4f47f159db6b45995;hpb=feb36b14278b4230af70dab90369a345b6a027ef

diff --git a/ccan/tdb2/transaction.c b/ccan/tdb2/transaction.c
index 64bd5366..dd94510c 100644
--- a/ccan/tdb2/transaction.c
+++ b/ccan/tdb2/transaction.c
@@ -203,7 +203,7 @@ static enum TDB_ERROR transaction_write(struct tdb_context *tdb, tdb_off_t off,
 		tdb_len_t len2 = PAGESIZE - (off % PAGESIZE);
 		ecode = transaction_write(tdb, off, buf, len2);
 		if (ecode != TDB_SUCCESS) {
-			return -1;
+			return ecode;
 		}
 		len -= len2;
 		off += len2;
@@ -345,16 +345,16 @@ static void transaction_write_existing(struct tdb_context *tdb, tdb_off_t off,
 /*
   out of bounds check during a transaction
 */
-static enum TDB_ERROR transaction_oob(struct tdb_context *tdb, tdb_off_t len,
-				      bool probe)
+static enum TDB_ERROR transaction_oob(struct tdb_context *tdb,
+				      tdb_off_t off, tdb_len_t len, bool probe)
 {
-	if (len <= tdb->file->map_size || probe) {
+	if ((off + len >= off && off + len <= tdb->file->map_size) || probe) {
 		return TDB_SUCCESS;
 	}
 
 	tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
 		   "tdb_oob len %lld beyond transaction size %lld",
-		   (long long)len,
+		   (long long)(off + len),
 		   (long long)tdb->file->map_size);
 	return TDB_ERR_IO;
 }
@@ -601,7 +601,7 @@ enum TDB_ERROR tdb_transaction_start(struct tdb_context *tdb)
 
 	/* make sure we know about any file expansions already done by
 	   anyone else */
-	tdb->tdb2.io->oob(tdb, tdb->file->map_size + 1, true);
+	tdb->tdb2.io->oob(tdb, tdb->file->map_size, 1, true);
 	tdb->tdb2.transaction->old_map_size = tdb->file->map_size;
 
 	/* finally hook the io methods, replacing them with
@@ -668,7 +668,7 @@ static enum TDB_ERROR tdb_recovery_area(struct tdb_context *tdb,
 	*recovery_offset = tdb_read_off(tdb,
 					offsetof(struct tdb_header, recovery));
 	if (TDB_OFF_IS_ERR(*recovery_offset)) {
-		return *recovery_offset;
+		return TDB_OFF_TO_ERR(*recovery_offset);
 	}
 
 	if (*recovery_offset == 0) {
@@ -836,10 +836,13 @@ static tdb_off_t create_recovery_area(struct tdb_context *tdb,
 
 	/* round up to a multiple of page size. Overallocate, since each
 	 * such allocation forces us to expand the file. */
-	rec->max_len
-		= (((sizeof(*rec) + rec_length + rec_length / 2)
-		    + PAGESIZE-1) & ~(PAGESIZE-1))
+	rec->max_len = tdb_expand_adjust(tdb->file->map_size, rec_length);
+
+	/* Round up to a page. */
+	rec->max_len = ((sizeof(*rec) + rec->max_len + PAGESIZE-1)
+			& ~(PAGESIZE-1))
 		- sizeof(*rec);
+
 	off = tdb->file->map_size;
 
 	/* Restore ->map_size before calling underlying expand_file.
@@ -852,9 +855,10 @@ static tdb_off_t create_recovery_area(struct tdb_context *tdb,
 	tdb->stats.transaction_expand_file++;
 	ecode = methods->expand_file(tdb, addition);
 	if (ecode != TDB_SUCCESS) {
-		return tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
-				  "tdb_recovery_allocate:"
-				  " failed to create recovery area");
+		tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
+			   "tdb_recovery_allocate:"
+			   " failed to create recovery area");
+		return TDB_ERR_TO_OFF(ecode);
 	}
 
 	/* we have to reset the old map size so that we don't try to
@@ -869,9 +873,10 @@ static tdb_off_t create_recovery_area(struct tdb_context *tdb,
 	ecode = methods->twrite(tdb, offsetof(struct tdb_header, recovery),
 				&recovery_off, sizeof(tdb_off_t));
 	if (ecode != TDB_SUCCESS) {
-		return tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
-				  "tdb_recovery_allocate:"
-				  " failed to write recovery head");
+		tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
+			   "tdb_recovery_allocate:"
+			   " failed to write recovery head");
+		return TDB_ERR_TO_OFF(ecode);
 	}
 	transaction_write_existing(tdb, offsetof(struct tdb_header, recovery),
 				   &recovery_off,
@@ -928,7 +933,7 @@ static enum TDB_ERROR transaction_setup_recovery(struct tdb_context *tdb)
 						    recovery);
 		if (TDB_OFF_IS_ERR(recovery_off)) {
 			free(recovery);
-			return recovery_off;
+			return TDB_OFF_TO_ERR(recovery_off);
 		}
 	}
 
@@ -1194,7 +1199,8 @@ enum TDB_ERROR tdb_transaction_recover(struct tdb_context *tdb)
 	/* find the recovery area */
 	recovery_head = tdb_read_off(tdb, offsetof(struct tdb_header,recovery));
 	if (TDB_OFF_IS_ERR(recovery_head)) {
-		return tdb_logerr(tdb, recovery_head, TDB_LOG_ERROR,
+		ecode = TDB_OFF_TO_ERR(recovery_head);
+		return tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
 				  "tdb_transaction_recover:"
 				  " failed to read recovery head");
 	}
@@ -1330,7 +1336,7 @@ tdb_bool_err tdb_needs_recovery(struct tdb_context *tdb)
 	/* read the recovery record */
 	ecode = tdb_read_convert(tdb, recovery_head, &rec, sizeof(rec));
 	if (ecode != TDB_SUCCESS) {
-		return ecode;
+		return TDB_ERR_TO_OFF(ecode);
 	}
 
 	return (rec.magic == TDB_RECOVERY_MAGIC);