From b7165d51e69bb6e38de79d5f330d66033682e070 Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Fri, 5 Jul 2024 16:06:59 -0500 Subject: [PATCH] t: Renamed LFS_T_CK -> LFS_T_CKDATA, kept implied LFS_T_CKMETA It still doesn't make sense to check data without checking metadata, but keeping this named LFS_T_CKDATA should hopefully clarify what it does differently from LFS_T_CKMETA. This implication is also now encoded in the bit pattern: LFS_T_CKMETA 0x0100 ---- ---1 ---- ---- LFS_T_CKDATA 0x0300 ---- --11 ---- ---- In theory a clever user could force only the CKDATA bit to be set, and such a configuration would _probably_ work fine, but it won't be supported just to cut down on possible configurations to test. No code changes: code stack before: 35228 2680 after: 35228 (+0.0%) 2680 (+0.0%) --- lfs.c | 9 +- lfs.h | 4 +- tests/test_traversal.toml | 286 +++++++++++++++++++------------------- 3 files changed, 149 insertions(+), 150 deletions(-) diff --git a/lfs.c b/lfs.c index a8138a7b..88e57f2e 100644 --- a/lfs.c +++ b/lfs.c @@ -8261,8 +8261,8 @@ static inline bool lfsr_t_isckmeta(uint32_t flags) { return flags & LFS_T_CKMETA; } -static inline bool lfsr_t_isck(uint32_t flags) { - return flags & LFS_T_CK; +static inline bool lfsr_t_isckdata(uint32_t flags) { + return flags & (LFS_T_CKDATA ^ LFS_T_CKMETA); } static inline bool lfsr_f_isdirty(uint32_t flags) { @@ -8592,7 +8592,6 @@ static int lfsr_mtree_traverse(lfs_t *lfs, lfsr_traversal_t *t, // validate btree nodes? note mdirs are already validated if ((lfsr_t_isckmeta(t->o.o.flags) - || lfsr_t_isck(t->o.o.flags) // we also need to fetch to know if we need to compact || lfsr_t_iscompact(t->o.o.flags)) && tag == LFSR_TAG_BRANCH) { @@ -8606,7 +8605,7 @@ static int lfsr_mtree_traverse(lfs_t *lfs, lfsr_traversal_t *t, } // validate data blocks? - if (lfsr_t_isck(t->o.o.flags) + if (lfsr_t_isckdata(t->o.o.flags) && tag == LFSR_TAG_BLOCK) { err = lfsr_bptr_ck(lfs, &bptr); if (err) { @@ -12831,7 +12830,7 @@ int lfsr_traversal_open(lfs_t *lfs, lfsr_traversal_t *t, uint32_t flags) { LFS_ASSERT(!lfsr_omdir_isopen(lfs, &t->o.o)); // some flags don't make sense when only traversing the mtree LFS_ASSERT(!lfsr_t_ismtreeonly(flags) || !lfsr_t_islookahead(flags)); - LFS_ASSERT(!lfsr_t_ismtreeonly(flags) || !lfsr_t_isck(flags)); + LFS_ASSERT(!lfsr_t_ismtreeonly(flags) || !lfsr_t_isckdata(flags)); // these flags are internal and shouldn't be provided by the user LFS_ASSERT(!lfsr_f_isdirty(flags)); diff --git a/lfs.h b/lfs.h index 8a4bac02..33b605a8 100644 --- a/lfs.h +++ b/lfs.h @@ -175,10 +175,10 @@ enum lfs_traversal_flags { LFS_T_LOOKAHEAD = 0x0040, // Populate lookahead buffer LFS_T_COMPACT = 0x0080, // Compact metadata logs LFS_T_CKMETA = 0x0100, // Check metadata checksums - LFS_T_CK = 0x0200, // Check metadata + data checksums + LFS_T_CKDATA = 0x0300, // Check metadata + data checksums // TODO // LFS_T_REPAIRMETA = 0x0400, // Repair metadata blocks -// LFS_T_REPAIR = 0x0800, // Repair metadata + data blocks +// LFS_T_REPAIRDATA = 0x0c00, // Repair metadata + data blocks // internally used flags LFS_F_DIRTY = 0x1000, // Filesystem has been modified diff --git a/tests/test_traversal.toml b/tests/test_traversal.toml index 8c69b86c..1c31a40c 100644 --- a/tests/test_traversal.toml +++ b/tests/test_traversal.toml @@ -10,7 +10,7 @@ after = [ # a simple traversal test [cases.test_traversal_simple] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.COMPACT = [false, true] code = ''' @@ -22,7 +22,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0) | ((COMPACT) ? LFS_T_COMPACT : 0)) => 0; struct lfs_tinfo tinfo; @@ -41,7 +41,7 @@ code = ''' # can we rewind? [cases.test_traversal_rewind] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.COMPACT = [false, true] code = ''' @@ -53,7 +53,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0) | ((COMPACT) ? LFS_T_COMPACT : 0)) => 0; struct lfs_tinfo tinfo; @@ -81,7 +81,7 @@ code = ''' # test that we don't get extra anything after end of traversal [cases.test_traversal_idempotent] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.COMPACT = [false, true] code = ''' @@ -93,7 +93,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0) | ((COMPACT) ? LFS_T_COMPACT : 0)) => 0; struct lfs_tinfo tinfo; @@ -123,7 +123,7 @@ code = ''' [cases.test_traversal_clobber_dirs] defines.N = [1, 2, 4, 8, 16, 32, 64, 128, 256, 512] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] code = ''' lfs_t lfs; lfsr_format(&lfs, CFG) => 0; @@ -143,7 +143,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0)) => 0; + | ((CKDATA) ? LFS_T_CKDATA : 0)) => 0; for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -232,7 +232,7 @@ defines.SIZE = [ '8*BLOCK_SIZE', ] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' lfs_t lfs; @@ -264,7 +264,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0)) => 0; + | ((CKDATA) ? LFS_T_CKDATA : 0)) => 0; for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -347,7 +347,7 @@ defines.SIZE = [ '8*BLOCK_SIZE', ] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' lfs_t lfs; @@ -378,7 +378,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0)) => 0; + | ((CKDATA) ? LFS_T_CKDATA : 0)) => 0; for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -474,7 +474,7 @@ code = ''' [cases.test_traversal_rewind_clobber_dirs] defines.N = [1, 2, 4, 8, 16, 32, 64, 128, 256, 512] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] code = ''' lfs_t lfs; lfsr_format(&lfs, CFG) => 0; @@ -494,7 +494,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0)) => 0; + | ((CKDATA) ? LFS_T_CKDATA : 0)) => 0; lfs_block_t r = 0; for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops @@ -592,7 +592,7 @@ defines.SIZE = [ '8*BLOCK_SIZE', ] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' lfs_t lfs; @@ -624,7 +624,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0)) => 0; + | ((CKDATA) ? LFS_T_CKDATA : 0)) => 0; lfs_block_t r = 0; for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops @@ -716,7 +716,7 @@ defines.SIZE = [ '8*BLOCK_SIZE', ] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' lfs_t lfs; @@ -747,7 +747,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0)) => 0; + | ((CKDATA) ? LFS_T_CKDATA : 0)) => 0; lfs_block_t r = 0; for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops @@ -934,7 +934,7 @@ defines.SIZE = [ '8*BLOCK_SIZE', ] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' for (lfs_block_t i = 0;; i += 2) { @@ -1030,7 +1030,7 @@ defines.SIZE = [ '8*BLOCK_SIZE', ] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' for (lfs_block_t i = 0;; i += 2) { @@ -1206,7 +1206,7 @@ defines.SIZE = [ '8*BLOCK_SIZE', ] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' for (lfs_block_t i = 0;; i++) { @@ -1300,7 +1300,7 @@ defines.SIZE = [ '8*BLOCK_SIZE', ] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' for (lfs_block_t i = 0;; i++) { @@ -1444,7 +1444,7 @@ code = ''' clobbered:; // traverse again, we should detect the clobbered metadata - lfsr_traversal_open(&lfs, &t, LFS_T_CK) => 0; + lfsr_traversal_open(&lfs, &t, LFS_T_CKDATA) => 0; for (lfs_block_t j = 0;; j++) { assert(j < 2*BLOCK_COUNT); @@ -1475,7 +1475,7 @@ defines.SIZE = [ '8*BLOCK_SIZE', ] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' for (lfs_block_t i = 0;; i++) { @@ -1539,7 +1539,7 @@ code = ''' clobbered:; // traverse again, we should detect the clobbered metadata - lfsr_traversal_open(&lfs, &t, LFS_T_CK) => 0; + lfsr_traversal_open(&lfs, &t, LFS_T_CKDATA) => 0; for (lfs_block_t j = 0;; j++) { assert(j < 2*BLOCK_COUNT); @@ -1570,7 +1570,7 @@ defines.SIZE = [ '8*BLOCK_SIZE', ] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' for (lfs_block_t i = 0;; i++) { @@ -1636,7 +1636,7 @@ code = ''' clobbered:; // traverse again, we should detect the clobbered metadata - lfsr_traversal_open(&lfs, &t, LFS_T_CK) => 0; + lfsr_traversal_open(&lfs, &t, LFS_T_CKDATA) => 0; for (lfs_block_t j = 0;; j++) { assert(j < 2*BLOCK_COUNT); @@ -1665,7 +1665,7 @@ done:; [cases.test_traversal_mutation] defines.WHEN = [0, 1, 2] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' lfs_t lfs; @@ -1676,7 +1676,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; if (WHEN == 0) { @@ -1718,7 +1718,7 @@ code = ''' [cases.test_traversal_mutation_excl] defines.WHEN = [0, 1, 2] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' lfs_t lfs; @@ -1730,7 +1730,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_EXCL | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; if (WHEN == 0) { @@ -1786,7 +1786,7 @@ done:; # test that we don't get extra anything after end of traversal [cases.test_traversal_mutation_idempotent] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' lfs_t lfs; @@ -1797,7 +1797,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; struct lfs_tinfo tinfo; lfsr_traversal_read(&lfs, &t, &tinfo) => 0; @@ -1841,7 +1841,7 @@ code = ''' [cases.test_traversal_mutation_excl_idempotent] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' lfs_t lfs; @@ -1853,7 +1853,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_EXCL | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; struct lfs_tinfo tinfo; lfsr_traversal_read(&lfs, &t, &tinfo) => 0; @@ -1896,7 +1896,7 @@ code = ''' defines.WHEN = [0, 1, 2] defines.EXCL = [false, true] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' lfs_t lfs; @@ -1908,7 +1908,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; if (WHEN == 0) { @@ -1964,7 +1964,7 @@ done:; defines.WHEN = [0, 1, 2] defines.EXCL = [false, true] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' lfs_t lfs; @@ -1982,7 +1982,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; if (WHEN == 0) { @@ -2038,7 +2038,7 @@ done:; defines.WHEN = [0, 1, 2] defines.EXCL = [false, true] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' lfs_t lfs; @@ -2056,7 +2056,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; if (WHEN == 0) { @@ -2112,7 +2112,7 @@ done:; [cases.test_traversal_mutation_fwrite] defines.EXCL = [false, true] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = [ 'FILE_BUFFER_SIZE/2', @@ -2145,7 +2145,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; while (true) { @@ -2185,7 +2185,7 @@ code = ''' [cases.test_traversal_mutation_fwrite_open] defines.EXCL = [false, true] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = [ 'FILE_BUFFER_SIZE/2', @@ -2221,7 +2221,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; while (true) { @@ -2272,7 +2272,7 @@ code = ''' # [cases.test_traversal_mutation_file_bsprout] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = 'FILE_BUFFER_SIZE/2' defines.TRUNC = [false, true] @@ -2307,7 +2307,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -2350,7 +2350,7 @@ code = ''' [cases.test_traversal_mutation_file_btree] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' defines.INLINE_SIZE = 0 @@ -2386,7 +2386,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -2443,7 +2443,7 @@ code = ''' [cases.test_traversal_mutation_file_bshrub] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' defines.TRUNC = [false, true] @@ -2478,7 +2478,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -2529,7 +2529,7 @@ code = ''' [cases.test_traversal_mutation_orphan_bsprout] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = 'FILE_BUFFER_SIZE/2' code = ''' @@ -2562,7 +2562,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -2606,7 +2606,7 @@ code = ''' [cases.test_traversal_mutation_orphan_btree] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' defines.INLINE_SIZE = 0 @@ -2640,7 +2640,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -2698,7 +2698,7 @@ code = ''' [cases.test_traversal_mutation_orphan_bshrub] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' code = ''' @@ -2731,7 +2731,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -2783,7 +2783,7 @@ code = ''' [cases.test_traversal_mutation_close_bsprout] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = 'FILE_BUFFER_SIZE/2' defines.DESYNC = [false, true] @@ -2817,7 +2817,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -2864,7 +2864,7 @@ code = ''' [cases.test_traversal_mutation_close_btree] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' defines.INLINE_SIZE = 0 @@ -2899,7 +2899,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -2960,7 +2960,7 @@ code = ''' [cases.test_traversal_mutation_close_bshrub] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' defines.DESYNC = [false, true] @@ -2994,7 +2994,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -3049,7 +3049,7 @@ code = ''' [cases.test_traversal_mutation_rm_bshrub] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' code = ''' @@ -3083,7 +3083,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -3124,7 +3124,7 @@ code = ''' [cases.test_traversal_mutation_mv_src_bshrub] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' code = ''' @@ -3167,7 +3167,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -3218,7 +3218,7 @@ code = ''' [cases.test_traversal_mutation_mv_dst_bshrub] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' code = ''' @@ -3261,7 +3261,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -3307,7 +3307,7 @@ code = ''' [cases.test_traversal_mutation_mroot_split] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' code = ''' @@ -3341,7 +3341,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -3402,7 +3402,7 @@ code = ''' [cases.test_traversal_mutation_mroot_split_bshrub_l] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' code = ''' @@ -3445,7 +3445,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -3515,7 +3515,7 @@ code = ''' [cases.test_traversal_mutation_mroot_split_bshrub_r] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' code = ''' @@ -3558,7 +3558,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -3623,7 +3623,7 @@ code = ''' [cases.test_traversal_mutation_mroot_extend] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' # force early relocations @@ -3659,7 +3659,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -3713,7 +3713,7 @@ code = ''' [cases.test_traversal_mutation_mroot_extend_bshrub] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' # force early relocations @@ -3749,7 +3749,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -3802,7 +3802,7 @@ code = ''' [cases.test_traversal_mutation_mroot_relocate] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' # force early relocations @@ -3847,7 +3847,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -3906,7 +3906,7 @@ code = ''' [cases.test_traversal_mutation_mroot_relocate_bshrub] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' # force early relocations @@ -3951,7 +3951,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroots @@ -4009,7 +4009,7 @@ code = ''' [cases.test_traversal_mutation_mtree_split] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' code = ''' @@ -4083,7 +4083,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -4175,7 +4175,7 @@ code = ''' [cases.test_traversal_mutation_mtree_split_bshrub_l] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' code = ''' @@ -4249,7 +4249,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -4348,7 +4348,7 @@ code = ''' [cases.test_traversal_mutation_mtree_split_bshrub_r] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' code = ''' @@ -4422,7 +4422,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -4515,7 +4515,7 @@ code = ''' [cases.test_traversal_mutation_mtree_extend] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' code = ''' @@ -4595,7 +4595,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -4679,7 +4679,7 @@ code = ''' [cases.test_traversal_mutation_mtree_extend_bshrub] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' code = ''' @@ -4759,7 +4759,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -4850,7 +4850,7 @@ code = ''' [cases.test_traversal_mutation_mtree_relocate] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' # force early relocations @@ -4935,7 +4935,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot @@ -5020,7 +5020,7 @@ code = ''' [cases.test_traversal_mutation_mtree_relocate_bshrub] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' # force early relocations @@ -5105,7 +5105,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroots @@ -5205,7 +5205,7 @@ code = ''' [cases.test_traversal_compact] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = 'FILE_BUFFER_SIZE/2' # set compact thresh to minimum @@ -5238,7 +5238,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_COMPACT | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot struct lfs_tinfo tinfo; @@ -5277,7 +5277,7 @@ code = ''' # yes, compactions should return busy if excl [cases.test_traversal_compact_excl] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = 'FILE_BUFFER_SIZE/2' # set compact thresh to minimum @@ -5311,7 +5311,7 @@ code = ''' LFS_T_COMPACT | LFS_T_EXCL | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot struct lfs_tinfo tinfo; @@ -5344,7 +5344,7 @@ code = ''' [cases.test_traversal_compact_mrootchain] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = 'FILE_BUFFER_SIZE/2' # set compact thresh to minimum @@ -5398,7 +5398,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_COMPACT | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mrootanchor struct lfs_tinfo tinfo; @@ -5444,7 +5444,7 @@ code = ''' [cases.test_traversal_compact_mroot_extend] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = 'FILE_BUFFER_SIZE/2' # set compact thresh to minimum @@ -5480,7 +5480,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_COMPACT | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // it's a bit unclear if we should follow the mroot or stay on the // mroot anchor during extends, so if this breaks in the future @@ -5520,7 +5520,7 @@ code = ''' [cases.test_traversal_compact_mroot_split] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = 'FILE_BUFFER_SIZE/2' # set compact thresh to minimum @@ -5581,7 +5581,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_COMPACT | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot struct lfs_tinfo tinfo; @@ -5640,7 +5640,7 @@ code = ''' [cases.test_traversal_compact_mtree] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = 'FILE_BUFFER_SIZE/2' # set compact thresh to minimum @@ -5750,7 +5750,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_COMPACT | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot struct lfs_tinfo tinfo; @@ -5822,7 +5822,7 @@ code = ''' [cases.test_traversal_compact_mtree_split] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = 'FILE_BUFFER_SIZE/2' # set compact thresh to minimum @@ -5927,7 +5927,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_COMPACT | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot struct lfs_tinfo tinfo; @@ -6016,7 +6016,7 @@ code = ''' [cases.test_traversal_compact_mtree_btree] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = 'FILE_BUFFER_SIZE/2' # set compact thresh to minimum @@ -6109,7 +6109,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_COMPACT | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot struct lfs_tinfo tinfo; @@ -6175,7 +6175,7 @@ code = ''' [cases.test_traversal_compact_btree] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] # limit files to very simple btrees defines.INLINE_SIZE = 0 @@ -6213,7 +6213,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_COMPACT | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot struct lfs_tinfo tinfo; @@ -6255,7 +6255,7 @@ code = ''' [cases.test_traversal_compact_btree_open] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] # limit files to very simple btrees defines.INLINE_SIZE = 0 @@ -6293,7 +6293,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_COMPACT | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot struct lfs_tinfo tinfo; @@ -6334,7 +6334,7 @@ code = ''' [cases.test_traversal_compact_btree_orphan] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] # limit files to very simple btrees defines.INLINE_SIZE = 0 @@ -6370,7 +6370,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_COMPACT | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot struct lfs_tinfo tinfo; @@ -6415,7 +6415,7 @@ code = ''' [cases.test_traversal_compact_btree_desync] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] # limit files to very simple btrees defines.INLINE_SIZE = 0 @@ -6472,7 +6472,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_COMPACT | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot struct lfs_tinfo tinfo; @@ -6525,7 +6525,7 @@ code = ''' [cases.test_traversal_compact_bshrub] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] # this configuration should create a 2-layer bshrub, which may be # a bit delicate @@ -6584,7 +6584,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_COMPACT | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot struct lfs_tinfo tinfo; @@ -6642,7 +6642,7 @@ code = ''' [cases.test_traversal_compact_bshrub_open] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] # this configuration should create a 2-layer bshrub, which may be # a bit delicate @@ -6701,7 +6701,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_COMPACT | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot struct lfs_tinfo tinfo; @@ -6760,7 +6760,7 @@ code = ''' [cases.test_traversal_compact_bshrub_orphan] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] # this configuration should create a 2-layer bshrub, which may be # a bit delicate @@ -6817,7 +6817,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_COMPACT | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot struct lfs_tinfo tinfo; @@ -6876,7 +6876,7 @@ code = ''' [cases.test_traversal_compact_bshrub_desync] defines.CKMETA = [false, true] -defines.CK = [false, true] +defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] # this configuration should create a 2-layer bshrub, which may be # a bit delicate @@ -6954,7 +6954,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, LFS_T_COMPACT | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; // traverse mroot struct lfs_tinfo tinfo; @@ -7030,7 +7030,7 @@ code = ''' defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.EXCL = [false, true] defines.CKMETA = [true] -defines.CK = [true] +defines.CKDATA = [true] defines.LOOKAHEAD = [false, true] defines.COMPACT = [false, true] # set compact thresh to minimum @@ -7047,7 +7047,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0) | ((COMPACT) ? LFS_T_COMPACT : 0)) => 0; @@ -7140,7 +7140,7 @@ code = ''' defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.EXCL = [false, true] defines.CKMETA = [true] -defines.CK = [true] +defines.CKDATA = [true] defines.LOOKAHEAD = [false, true] defines.COMPACT = [false, true] # set compact thresh to minimum @@ -7164,7 +7164,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0) | ((COMPACT) ? LFS_T_COMPACT : 0)) => 0; @@ -7321,7 +7321,7 @@ code = ''' defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.EXCL = [false, true] defines.CKMETA = [true] -defines.CK = [true] +defines.CKDATA = [true] defines.LOOKAHEAD = [false, true] defines.COMPACT = [false, true] # set compact thresh to minimum @@ -7348,7 +7348,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0) | ((COMPACT) ? LFS_T_COMPACT : 0)) => 0; @@ -7425,7 +7425,7 @@ code = ''' defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.EXCL = [false, true] defines.CKMETA = [true] -defines.CK = [true] +defines.CKDATA = [true] defines.LOOKAHEAD = [false, true] defines.COMPACT = [false, true] # set compact thresh to minimum @@ -7460,7 +7460,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0) | ((COMPACT) ? LFS_T_COMPACT : 0)) => 0; @@ -7668,7 +7668,7 @@ code = ''' defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.EXCL = [false, true] defines.CKMETA = [true] -defines.CK = [true] +defines.CKDATA = [true] defines.LOOKAHEAD = [false, true] defines.COMPACT = [false, true] # set compact thresh to minimum @@ -7735,7 +7735,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0) | ((COMPACT) ? LFS_T_COMPACT : 0)) => 0; @@ -7831,7 +7831,7 @@ code = ''' defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.EXCL = [false, true] defines.CKMETA = [true] -defines.CK = [true] +defines.CKDATA = [true] defines.LOOKAHEAD = [false, true] defines.COMPACT = [false, true] # set compact thresh to minimum @@ -7876,7 +7876,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0) | ((COMPACT) ? LFS_T_COMPACT : 0)) => 0; @@ -8202,7 +8202,7 @@ code = ''' defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.EXCL = [false, true] defines.CKMETA = [true] -defines.CK = [true] +defines.CKDATA = [true] defines.LOOKAHEAD = [false, true] defines.COMPACT = [false, true] # set compact thresh to minimum @@ -8248,7 +8248,7 @@ code = ''' lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) | ((CKMETA) ? LFS_T_CKMETA : 0) - | ((CK) ? LFS_T_CK : 0) + | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0) | ((COMPACT) ? LFS_T_COMPACT : 0)) => 0;