]> git.ozlabs.org Git - ccan/commitdiff
tdb2: remove tailer from transaction record.
authorRusty Russell <rusty@rustcorp.com.au>
Thu, 21 Apr 2011 02:10:25 +0000 (11:40 +0930)
committerRusty Russell <rusty@rustcorp.com.au>
Thu, 21 Apr 2011 02:10:25 +0000 (11:40 +0930)
We don't have tailers in tdb2, so it's just 8 bytes of confusing wastage.

ccan/tdb2/transaction.c

index f1414391abe42caa7b81504dede1ea3700291c1b..7a2ebbe9a3bb111e0a2c7ea2c4573a6ac2f82b44 100644 (file)
@@ -615,7 +615,7 @@ static tdb_len_t tdb_recovery_size(struct tdb_context *tdb)
        tdb_len_t recovery_size = 0;
        int i;
 
        tdb_len_t recovery_size = 0;
        int i;
 
-       recovery_size = sizeof(tdb_len_t);
+       recovery_size = 0;
        for (i=0;i<tdb->transaction->num_blocks;i++) {
                if (i * PAGESIZE >= tdb->transaction->old_map_size) {
                        break;
        for (i=0;i<tdb->transaction->num_blocks;i++) {
                if (i * PAGESIZE >= tdb->transaction->old_map_size) {
                        break;
@@ -770,7 +770,7 @@ static enum TDB_ERROR transaction_setup_recovery(struct tdb_context *tdb,
        const struct tdb_methods *methods = tdb->transaction->io_methods;
        struct tdb_recovery_record *rec;
        tdb_off_t old_map_size = tdb->transaction->old_map_size;
        const struct tdb_methods *methods = tdb->transaction->io_methods;
        struct tdb_recovery_record *rec;
        tdb_off_t old_map_size = tdb->transaction->old_map_size;
-       uint64_t magic, tailer;
+       uint64_t magic;
        int i;
        enum TDB_ERROR ecode;
 
        int i;
        enum TDB_ERROR ecode;
 
@@ -839,11 +839,6 @@ static enum TDB_ERROR transaction_setup_recovery(struct tdb_context *tdb,
                p += sizeof(offset) + sizeof(length) + length;
        }
 
                p += sizeof(offset) + sizeof(length) + length;
        }
 
-       /* and the tailer */
-       tailer = sizeof(*rec) + recovery_max_size;
-       memcpy(p, &tailer, sizeof(tailer));
-       tdb_convert(tdb, p, sizeof(tailer));
-
        /* write the recovery data to the recovery area */
        ecode = methods->twrite(tdb, recovery_offset, data,
                                sizeof(*rec) + recovery_size);
        /* write the recovery data to the recovery area */
        ecode = methods->twrite(tdb, recovery_offset, data,
                                sizeof(*rec) + recovery_size);