diff --git a/lfs.c b/lfs.c index 19e911eb..b5ad40b9 100644 --- a/lfs.c +++ b/lfs.c @@ -14141,7 +14141,6 @@ int lfsr_format(lfs_t *lfs, uint32_t flags, | LFS_IFDEF_CKFETCHES(LFS_F_CKFETCHES, 0) | LFS_IFDEF_CKPARITY(LFS_F_CKPARITY, 0) | LFS_IFDEF_CKDATACKSUMS(LFS_F_CKDATACKSUMS, 0) - | LFS_F_COMPACT | LFS_F_CKMETA | LFS_F_CKDATA)) == 0); // some flags don't make sense when only traversing the mtree @@ -14179,14 +14178,12 @@ int lfsr_format(lfs_t *lfs, uint32_t flags, // run gc if requested if (flags & ( - LFS_F_COMPACT - | LFS_F_CKMETA + LFS_F_CKMETA | LFS_F_CKDATA)) { lfsr_traversal_t t; err = lfsr_fs_gc_(lfs, &t, flags & ( - LFS_F_COMPACT - | LFS_F_CKMETA + LFS_F_CKMETA | LFS_F_CKDATA), -1); if (err) { diff --git a/lfs.h b/lfs.h index 369b683f..f9264e08 100644 --- a/lfs.h +++ b/lfs.h @@ -173,7 +173,6 @@ enum lfs_type { 0x08000000 // Check data checksums on reads #endif -#define LFS_F_COMPACT 0x00008000 // Compact metadata logs #define LFS_F_CKMETA 0x00010000 // Check metadata checksums #define LFS_F_CKDATA 0x00020000 // Check metadata + data checksums diff --git a/tests/test_mount.toml b/tests/test_mount.toml index 8ef0803f..e59bff4b 100644 --- a/tests/test_mount.toml +++ b/tests/test_mount.toml @@ -85,7 +85,6 @@ defines.CKPROGS = [false, true] defines.CKFETCHES = [false, true] defines.CKPARITY = [false, true] defines.CKDATACKSUMS = [false, true] -defines.COMPACT = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] if = [ @@ -104,9 +103,8 @@ code = ''' | ((CKDATACKSUMS) ? LFS_IFDEF_CKDATACKSUMS(LFS_F_CKDATACKSUMS, -1) : 0) - | ((COMPACT) ? LFS_M_COMPACT : 0) - | ((CKMETA) ? LFS_M_CKMETA : 0) - | ((CKDATA) ? LFS_M_CKDATA : 0), + | ((CKMETA) ? LFS_F_CKMETA : 0) + | ((CKDATA) ? LFS_F_CKDATA : 0), CFG) => 0; lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;