ntdb: remove last block transactoin logic.

Now our database is always a multiple of NTDB_PGSIZE, we can remove the
special handling for the last block.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

1 files changed, 1 insertions, 44 deletions

diff --git a/lib/ntdb/transaction.c b/lib/ntdb/transaction.c
index c593ee2e71..222aa1fdbc 100644
--- a/lib/ntdb/transaction.c
+++ b/lib/ntdb/transaction.c
@@ -100,7 +100,6 @@ struct ntdb_transaction {
 	   written to, it gets created in this list */
 	uint8_t **blocks;
 	size_t num_blocks;
-	size_t last_block_size; /* number of valid bytes in the last block */
 
 	/* non-zero when an internal transaction error has
 	   occurred. All write operations will then fail until the
@@ -159,14 +158,6 @@ static enum NTDB_ERROR transaction_read(struct ntdb_context *ntdb, ntdb_off_t of
 		return 0;
 	}
 
-	/* it is in the block list. Now check for the last block */
-	if (blk == ntdb->transaction->num_blocks-1) {
-		if (len > ntdb->transaction->last_block_size) {
-			ecode = NTDB_ERR_IO;
-			goto fail;
-		}
-	}
-
 	/* now copy it out of this block */
 	memcpy(buf, ntdb->transaction->blocks[blk] + (off % NTDB_PGSIZE), len);
 	return NTDB_SUCCESS;
@@ -238,7 +229,6 @@ static enum NTDB_ERROR transaction_write(struct ntdb_context *ntdb, ntdb_off_t o
 		       (1+(blk - ntdb->transaction->num_blocks))*sizeof(uint8_t *));
 		ntdb->transaction->blocks = new_blocks;
 		ntdb->transaction->num_blocks = blk+1;
-		ntdb->transaction->last_block_size = 0;
 	}
 
 	/* allocate and fill a block? */
@@ -269,9 +259,6 @@ static enum NTDB_ERROR transaction_write(struct ntdb_context *ntdb, ntdb_off_t o
 				SAFE_FREE(ntdb->transaction->blocks[blk]);
 				goto fail;
 			}
-			if (blk == ntdb->transaction->num_blocks-1) {
-				ntdb->transaction->last_block_size = len2;
-			}
 		}
 	}
 
@@ -281,12 +268,6 @@ static enum NTDB_ERROR transaction_write(struct ntdb_context *ntdb, ntdb_off_t o
 	} else {
 		memcpy(ntdb->transaction->blocks[blk] + off, buf, len);
 	}
-	if (blk == ntdb->transaction->num_blocks-1) {
-		if (len + off > ntdb->transaction->last_block_size) {
-			ntdb->transaction->last_block_size = len + off;
-		}
-	}
-
 	return NTDB_SUCCESS;
 
 fail:
@@ -327,14 +308,6 @@ static void transaction_write_existing(struct ntdb_context *ntdb, ntdb_off_t off
 		return;
 	}
 
-	if (blk == ntdb->transaction->num_blocks-1 &&
-	    off + len > ntdb->transaction->last_block_size) {
-		if (off >= ntdb->transaction->last_block_size) {
-			return;
-		}
-		len = ntdb->transaction->last_block_size - off;
-	}
-
 	/* overwrite part of an existing block */
 	memcpy(ntdb->transaction->blocks[blk] + off, buf, len);
 }
@@ -630,12 +603,7 @@ static ntdb_len_t ntdb_recovery_size(struct ntdb_context *ntdb)
 		if (ntdb->transaction->blocks[i] == NULL) {
 			continue;
 		}
-		recovery_size += 2*sizeof(ntdb_off_t);
-		if (i == ntdb->transaction->num_blocks-1) {
-			recovery_size += ntdb->transaction->last_block_size;
-		} else {
-			recovery_size += NTDB_PGSIZE;
-		}
+		recovery_size += 2*sizeof(ntdb_off_t) + NTDB_PGSIZE;
 	}
 
 	return recovery_size;
@@ -748,10 +716,6 @@ static struct ntdb_recovery_record *alloc_recovery(struct ntdb_context *ntdb,
 
 		offset = i * NTDB_PGSIZE;
 		length = NTDB_PGSIZE;
-		if (i == ntdb->transaction->num_blocks-1) {
-			length = ntdb->transaction->last_block_size;
-		}
-
 		if (offset >= ntdb->transaction->old_map_size) {
 			continue;
 		}
@@ -763,10 +727,6 @@ static struct ntdb_recovery_record *alloc_recovery(struct ntdb_context *ntdb,
 					   " boundary");
 			goto fail;
 		}
-		if (offset + length > ntdb->transaction->old_map_size) {
-			/* Short read at EOF. */
-			length = ntdb->transaction->old_map_size - offset;
-		}
 		buffer = ntdb_access_read(ntdb, offset, length, false);
 		if (NTDB_PTR_IS_ERR(buffer)) {
 			ecode = NTDB_PTR_ERR(buffer);
@@ -1103,9 +1063,6 @@ _PUBLIC_ enum NTDB_ERROR ntdb_transaction_commit(struct ntdb_context *ntdb)
 
 		offset = i * NTDB_PGSIZE;
 		length = NTDB_PGSIZE;
-		if (i == ntdb->transaction->num_blocks-1) {
-			length = ntdb->transaction->last_block_size;
-		}
 
 		ecode = methods->twrite(ntdb, offset,
 					ntdb->transaction->blocks[i], length);