Github/littlefs
1
Fork 0
Code Actions Activity

Reverted LFS3_CKDATACKSUMREADS -> LFS3_CKDATACKSUMS

Browse Source 
LFS3_CKDATACKSUMREADS is just too much.

The downside is it may not be clear how LFS3_CKDATACKSUMREADS interacts
with the future planned LFS3_CKREADS (LFS3_CKREADS implies
LFS3_CKDATACKSUMS + LFS3_CKMETAREDUND), but on the flip side you may
actually be able to type LFS3_CKDATACKSUMS on the first try.
This commit is contained in:
Christopher Haster
2025-07-16 14:13:08 -05:00
parent 17cefcdd42
commit 0828fd9bf3
6 changed files with 111 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs3.c
+37 -37
View File
@@ -742,7 +742,7 @@ static inline lfs3_size_t lfs3_ptail_off(const lfs3_t *lfs3) {
// checked read helpers
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
static int lfs3_bd_ckprefix(lfs3_t *lfs3,
lfs3_block_t block, lfs3_size_t off, lfs3_size_t hint,
lfs3_size_t cksize, uint32_t cksum,
@@ -777,7 +777,7 @@ static int lfs3_bd_ckprefix(lfs3_t *lfs3,
}
#endif
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
static int lfs3_bd_cksuffix(lfs3_t *lfs3,
lfs3_block_t block, lfs3_size_t off, lfs3_size_t hint,
lfs3_size_t cksize, uint32_t cksum,
@@ -818,7 +818,7 @@ static int lfs3_bd_cksuffix(lfs3_t *lfs3,
// contributes to the relevant parity/checksum, this may be
// significantly more than the data we actually end up using
//
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
static int lfs3_bd_readck(lfs3_t *lfs3,
lfs3_block_t block, lfs3_size_t off, lfs3_size_t hint,
void *buffer, lfs3_size_t size,
@@ -868,7 +868,7 @@ static int lfs3_bd_readck(lfs3_t *lfs3,
//
// we'd also need to worry about early termination in lfs3_bd_cmp/cmpck
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
static lfs3_scmp_t lfs3_bd_cmpck(lfs3_t *lfs3,
lfs3_block_t block, lfs3_size_t off, lfs3_size_t hint,
const void *buffer, lfs3_size_t size,
@@ -932,7 +932,7 @@ static lfs3_scmp_t lfs3_bd_cmpck(lfs3_t *lfs3,
}
#endif
#if !defined(LFS3_RDONLY) && defined(LFS3_CKDATACKSUMREADS)
#if !defined(LFS3_RDONLY) && defined(LFS3_CKDATACKSUMS)
static int lfs3_bd_cpyck(lfs3_t *lfs3,
lfs3_block_t dst_block, lfs3_size_t dst_off,
lfs3_block_t src_block, lfs3_size_t src_off, lfs3_size_t hint,
@@ -1591,7 +1591,7 @@ static lfs3_ssize_t lfs3_bd_progtag(lfs3_t *lfs3,
#define LFS3_DATA_ONDISK 0x80000000
#define LFS3_DATA_ISBPTR 0x40000000
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
#define LFS3_DATA_ISERASED 0x80000000
#endif
@@ -1628,13 +1628,13 @@ static inline lfs3_size_t lfs3_data_size(lfs3_data_t data) {
return data.size & ~LFS3_DATA_ONDISK & ~LFS3_DATA_ISBPTR;
}
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
static inline lfs3_size_t lfs3_data_cksize(lfs3_data_t data) {
return data.u.disk.cksize & ~LFS3_DATA_ISERASED;
}
#endif
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
static inline uint32_t lfs3_data_cksum(lfs3_data_t data) {
return data.u.disk.cksum;
}
@@ -1679,7 +1679,7 @@ static inline lfs3_data_t lfs3_data_slice(lfs3_data_t data,
// consuming the data
// needed in lfs3_data_read and friends
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
static inline bool lfs3_m_isckdatacksums(uint32_t flags);
#endif
@@ -1691,11 +1691,11 @@ static lfs3_ssize_t lfs3_data_read(lfs3_t *lfs3, lfs3_data_t *data,
// on-disk?
if (lfs3_data_ondisk(*data)) {
// validating data cksums?
if (LFS3_IFDEF_CKDATACKSUMREADS(
if (LFS3_IFDEF_CKDATACKSUMS(
lfs3_m_isckdatacksums(lfs3->flags)
&& lfs3_data_isbptr(*data),
false)) {
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
int err = lfs3_bd_readck(lfs3,
data->u.disk.block, data->u.disk.off,
// note our hint includes the full data range
@@ -1798,11 +1798,11 @@ static lfs3_scmp_t lfs3_data_cmp(lfs3_t *lfs3, lfs3_data_t data,
// on-disk?
if (lfs3_data_ondisk(data)) {
// validating data cksums?
if (LFS3_IFDEF_CKDATACKSUMREADS(
if (LFS3_IFDEF_CKDATACKSUMS(
lfs3_m_isckdatacksums(lfs3->flags)
&& lfs3_data_isbptr(data),
false)) {
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
int cmp = lfs3_bd_cmpck(lfs3,
// note the 0 hint, we don't usually use any
// following data
@@ -1871,11 +1871,11 @@ static int lfs3_bd_progdata(lfs3_t *lfs3,
// on-disk?
if (lfs3_data_ondisk(data)) {
// validating data cksums?
if (LFS3_IFDEF_CKDATACKSUMREADS(
if (LFS3_IFDEF_CKDATACKSUMS(
lfs3_m_isckdatacksums(lfs3->flags)
&& lfs3_data_isbptr(data),
false)) {
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
int err = lfs3_bd_cpyck(lfs3, block, off,
data.u.disk.block, data.u.disk.off, lfs3_data_size(data),
lfs3_data_size(data),
@@ -2418,7 +2418,7 @@ static void lfs3_bptr_init(lfs3_bptr_t *bptr,
bptr->d.size = data.size | LFS3_DATA_ONDISK | LFS3_BPTR_ISBPTR;
bptr->d.u.disk.block = data.u.disk.block;
bptr->d.u.disk.off = data.u.disk.off;
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
bptr->d.u.disk.cksize = cksize;
bptr->d.u.disk.cksum = cksum;
#else
@@ -2430,7 +2430,7 @@ static void lfs3_bptr_init(lfs3_bptr_t *bptr,
static inline void lfs3_bptr_discard(lfs3_bptr_t *bptr) {
bptr->d = LFS3_DATA_NULL();
#if !defined(LFS3_2BONLY) && !defined(LFS3_CKDATACKSUMREADS)
#if !defined(LFS3_2BONLY) && !defined(LFS3_CKDATACKSUMS)
bptr->cksize = 0;
bptr->cksum = 0;
#endif
@@ -2438,7 +2438,7 @@ static inline void lfs3_bptr_discard(lfs3_bptr_t *bptr) {
#if !defined(LFS3_RDONLY) && !defined(LFS3_2BONLY)
static inline void lfs3_bptr_claim(lfs3_bptr_t *bptr) {
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
bptr->d.u.disk.cksize &= ~LFS3_BPTR_ISERASED;
#else
bptr->cksize &= ~LFS3_BPTR_ISERASED;
@@ -2467,7 +2467,7 @@ static inline lfs3_size_t lfs3_bptr_size(const lfs3_bptr_t *bptr) {
// messy...
#if !defined(LFS3_RDONLY) && !defined(LFS3_2BONLY)
static inline bool lfs3_bptr_iserased(const lfs3_bptr_t *bptr) {
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
return bptr->d.u.disk.cksize & LFS3_BPTR_ISERASED;
#else
return bptr->cksize & LFS3_BPTR_ISERASED;
@@ -2477,7 +2477,7 @@ static inline bool lfs3_bptr_iserased(const lfs3_bptr_t *bptr) {
#ifndef LFS3_2BONLY
static inline lfs3_size_t lfs3_bptr_cksize(const lfs3_bptr_t *bptr) {
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
return LFS3_IFDEF_RDONLY(
bptr->d.u.disk.cksize,
bptr->d.u.disk.cksize & ~LFS3_BPTR_ISERASED);
@@ -2491,7 +2491,7 @@ static inline lfs3_size_t lfs3_bptr_cksize(const lfs3_bptr_t *bptr) {
#ifndef LFS3_2BONLY
static inline uint32_t lfs3_bptr_cksum(const lfs3_bptr_t *bptr) {
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
return bptr->d.u.disk.cksum;
#else
return bptr->cksum;
@@ -2567,7 +2567,7 @@ static int lfs3_data_readbptr(lfs3_t *lfs3, lfs3_data_t *data,
// read the cksize, cksum
err = lfs3_data_readlleb128(lfs3, data,
LFS3_IFDEF_CKDATACKSUMREADS(
LFS3_IFDEF_CKDATACKSUMS(
&bptr->d.u.disk.cksize,
&bptr->cksize));
if (err) {
@@ -2575,7 +2575,7 @@ static int lfs3_data_readbptr(lfs3_t *lfs3, lfs3_data_t *data,
}
err = lfs3_data_readle32(lfs3, data,
LFS3_IFDEF_CKDATACKSUMREADS(
LFS3_IFDEF_CKDATACKSUMS(
&bptr->d.u.disk.cksum,
&bptr->cksum));
if (err) {
@@ -7347,13 +7347,13 @@ static inline bool lfs3_m_isckparity(uint32_t flags) {
}
#endif
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
static inline bool lfs3_m_isckdatacksums(uint32_t flags) {
(void)flags;
#ifdef LFS3_YES_CKDATACKSUMREADS
#ifdef LFS3_YES_CKDATACKSUMS
return true;
#else
return flags & LFS3_M_CKDATACKSUMREADS;
return flags & LFS3_M_CKDATACKSUMS;
#endif
}
#endif
@@ -14294,8 +14294,8 @@ static int lfs3_init(lfs3_t *lfs3, uint32_t flags,
| LFS3_IFDEF_CKPROGS(LFS3_M_CKPROGS, 0)
| LFS3_IFDEF_CKFETCHES(LFS3_M_CKFETCHES, 0)
| LFS3_IFDEF_CKMETAPARITY(LFS3_M_CKMETAPARITY, 0)
| LFS3_IFDEF_CKDATACKSUMREADS(
LFS3_M_CKDATACKSUMREADS,
| LFS3_IFDEF_CKDATACKSUMS(
LFS3_M_CKDATACKSUMS,
0))) == 0);
// LFS3_M_REVDBG and LFS3_M_REVNOISE are incompatible
#if defined(LFS3_REVNOISE) && defined(LFS3_REVDBG)
@@ -15170,8 +15170,8 @@ int lfs3_mount(lfs3_t *lfs3, uint32_t flags,
#ifdef LFS3_YES_CKMETAPARITY
flags |= LFS3_M_CKMETAPARITY;
#endif
#ifdef LFS3_YES_CKDATACKSUMREADS
flags |= LFS3_M_CKDATACKSUMREADS;
#ifdef LFS3_YES_CKDATACKSUMS
flags |= LFS3_M_CKDATACKSUMS;
#endif
#ifdef LFS3_YES_MKCONSISTENT
flags |= LFS3_M_MKCONSISTENT;
@@ -15200,7 +15200,7 @@ int lfs3_mount(lfs3_t *lfs3, uint32_t flags,
| LFS3_IFDEF_CKPROGS(LFS3_M_CKPROGS, 0)
| LFS3_IFDEF_CKFETCHES(LFS3_M_CKFETCHES, 0)
| LFS3_IFDEF_CKMETAPARITY(LFS3_M_CKMETAPARITY, 0)
| LFS3_IFDEF_CKDATACKSUMREADS(LFS3_M_CKDATACKSUMREADS, 0)
| LFS3_IFDEF_CKDATACKSUMS(LFS3_M_CKDATACKSUMS, 0)
| LFS3_IFDEF_RDONLY(0, LFS3_M_MKCONSISTENT)
| LFS3_IFDEF_RDONLY(0, LFS3_M_LOOKAHEAD)
| LFS3_IFDEF_RDONLY(0, LFS3_M_COMPACT)
@@ -15222,7 +15222,7 @@ int lfs3_mount(lfs3_t *lfs3, uint32_t flags,
| LFS3_IFDEF_CKPROGS(LFS3_M_CKPROGS, 0)
| LFS3_IFDEF_CKFETCHES(LFS3_M_CKFETCHES, 0)
| LFS3_IFDEF_CKMETAPARITY(LFS3_M_CKMETAPARITY, 0)
| LFS3_IFDEF_CKDATACKSUMREADS(LFS3_M_CKDATACKSUMREADS, 0)),
| LFS3_IFDEF_CKDATACKSUMS(LFS3_M_CKDATACKSUMS, 0)),
cfg);
if (err) {
return err;
@@ -15397,8 +15397,8 @@ int lfs3_format(lfs3_t *lfs3, uint32_t flags,
#ifdef LFS3_YES_CKMETAPARITY
flags |= LFS3_F_CKMETAPARITY;
#endif
#ifdef LFS3_YES_CKDATACKSUMREADS
flags |= LFS3_F_CKDATACKSUMREADS;
#ifdef LFS3_YES_CKDATACKSUMS
flags |= LFS3_F_CKDATACKSUMS;
#endif
#ifdef LFS3_YES_CKMETA
flags |= LFS3_F_CKMETA;
@@ -15415,7 +15415,7 @@ int lfs3_format(lfs3_t *lfs3, uint32_t flags,
| LFS3_IFDEF_CKPROGS(LFS3_F_CKPROGS, 0)
| LFS3_IFDEF_CKFETCHES(LFS3_F_CKFETCHES, 0)
| LFS3_IFDEF_CKMETAPARITY(LFS3_F_CKMETAPARITY, 0)
| LFS3_IFDEF_CKDATACKSUMREADS(LFS3_F_CKDATACKSUMREADS, 0)
| LFS3_IFDEF_CKDATACKSUMS(LFS3_F_CKDATACKSUMS, 0)
| LFS3_F_CKMETA
| LFS3_F_CKDATA)) == 0);
@@ -15427,7 +15427,7 @@ int lfs3_format(lfs3_t *lfs3, uint32_t flags,
| LFS3_IFDEF_CKPROGS(LFS3_F_CKPROGS, 0)
| LFS3_IFDEF_CKFETCHES(LFS3_F_CKFETCHES, 0)
| LFS3_IFDEF_CKMETAPARITY(LFS3_F_CKMETAPARITY, 0)
| LFS3_IFDEF_CKDATACKSUMREADS(LFS3_F_CKDATACKSUMREADS, 0)),
| LFS3_IFDEF_CKDATACKSUMS(LFS3_F_CKDATACKSUMS, 0)),
cfg);
if (err) {
return err;
@@ -15489,7 +15489,7 @@ int lfs3_fs_stat(lfs3_t *lfs3, struct lfs3_fsinfo *fsinfo) {
| LFS3_IFDEF_CKPROGS(LFS3_I_CKPROGS, 0)
| LFS3_IFDEF_CKFETCHES(LFS3_I_CKFETCHES, 0)
| LFS3_IFDEF_CKMETAPARITY(LFS3_I_CKMETAPARITY, 0)
| LFS3_IFDEF_CKDATACKSUMREADS(LFS3_I_CKDATACKSUMREADS, 0)
| LFS3_IFDEF_CKDATACKSUMS(LFS3_I_CKDATACKSUMS, 0)
| LFS3_IFDEF_RDONLY(0, LFS3_I_MKCONSISTENT)
| LFS3_IFDEF_RDONLY(0, LFS3_I_LOOKAHEAD)
| LFS3_IFDEF_RDONLY(0, LFS3_I_COMPACT)
lfs3.h
+9 -9
View File
@@ -184,8 +184,8 @@ enum lfs3_type {
#define LFS3_F_CKMETAPARITY \
0x00200000 // Check metadata tag parity bits
#endif
#ifdef LFS3_CKDATACKSUMREADS
#define LFS3_F_CKDATACKSUMREADS \
#ifdef LFS3_CKDATACKSUMS
#define LFS3_F_CKDATACKSUMS \
0x00800000 // Check data checksums on reads
#endif
@@ -218,8 +218,8 @@ enum lfs3_type {
#define LFS3_M_CKMETAPARITY \
0x00200000 // Check metadata tag parity bits
#endif
#ifdef LFS3_CKDATACKSUMREADS
#define LFS3_M_CKDATACKSUMREADS \
#ifdef LFS3_CKDATACKSUMS
#define LFS3_M_CKDATACKSUMS \
0x00800000 // Check data checksums on reads
#endif
@@ -258,9 +258,9 @@ enum lfs3_type {
#define LFS3_I_CKMETAPARITY \
0x00200000 // Mounted with LFS3_M_CKMETAPARITY
#endif
#ifdef LFS3_CKDATACKSUMREADS
#define LFS3_I_CKDATACKSUMREADS \
0x00800000 // Mounted with LFS3_M_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
#define LFS3_I_CKDATACKSUMS \
0x00800000 // Mounted with LFS3_M_CKDATACKSUMS
#endif
#ifndef LFS3_RDONLY
@@ -640,7 +640,7 @@ typedef struct lfs3_data {
lfs3_block_t block;
lfs3_size_t off;
// optional context for validating data
#ifdef LFS3_CKDATACKSUMREADS
#ifdef LFS3_CKDATACKSUMS
// sign(cksize)=0 => block not erased
// sign(cksize)=1 => block erased
lfs3_size_t cksize;
@@ -656,7 +656,7 @@ typedef struct lfs3_bptr {
// sign2(size)=0b10 => on-disk data
// sign2(size)=0b11 => block pointer
lfs3_data_t d;
#if !defined(LFS3_2BONLY) && !defined(LFS3_CKDATACKSUMREADS)
#if !defined(LFS3_2BONLY) && !defined(LFS3_CKDATACKSUMS)
// sign(cksize)=0 => block not erased
// sign(cksize)=1 => block erased
lfs3_size_t cksize;
lfs3_util.h
+7 -7
View File
@@ -41,8 +41,8 @@
#ifndef LFS3_CKMETAPARITY
#define LFS3_CKMETAPARITY
#endif
#ifndef LFS3_CKDATACKSUMREADS
#define LFS3_CKDATACKSUMREADS
#ifndef LFS3_CKDATACKSUMS
#define LFS3_CKDATACKSUMS
#endif
#ifndef LFS3_GC
#define LFS3_GC
@@ -74,8 +74,8 @@
#ifdef LFS3_YES_CKMETAPARITY
#define LFS3_CKMETAPARITY
#endif
#ifdef LFS3_YES_CKDATACKSUMREADS
#define LFS3_CKDATACKSUMREADS
#ifdef LFS3_YES_CKDATACKSUMS
#define LFS3_CKDATACKSUMS
#endif
#ifdef LFS3_YES_GC
#define LFS3_GC
@@ -245,10 +245,10 @@
#define LFS3_IFDEF_CKMETAPARITY(a, b) (b)
#endif
#ifdef LFS3_CKDATACKSUMREADS
#define LFS3_IFDEF_CKDATACKSUMREADS(a, b) (a)
#ifdef LFS3_CKDATACKSUMS
#define LFS3_IFDEF_CKDATACKSUMS(a, b) (a)
#else
#define LFS3_IFDEF_CKDATACKSUMREADS(a, b) (b)
#define LFS3_IFDEF_CKDATACKSUMS(a, b) (b)
#endif
#ifdef LFS3_GC
scripts/dbgflags.py
+3 -6
View File
@@ -66,8 +66,7 @@ FLAGS = [
('F_CKPROGS', 0x00080000, "Check progs by reading back progged data" ),
('F_CKFETCHES', 0x00100000, "Check block checksums before first use" ),
('F_CKMETAPARITY', 0x00200000, "Check metadata tag parity bits" ),
('F_CKDATACKSUMREADS',
0x00800000, "Check data checksums on reads" ),
('F_CKDATACKSUMS', 0x00800000, "Check data checksums on reads" ),
('F_CKMETA', 0x00001000, "Check metadata checksums" ),
('F_CKDATA', 0x00002000, "Check metadata + data checksums" ),
@@ -83,8 +82,7 @@ FLAGS = [
('M_CKPROGS', 0x00080000, "Check progs by reading back progged data" ),
('M_CKFETCHES', 0x00100000, "Check block checksums before first use" ),
('M_CKMETAPARITY', 0x00200000, "Check metadata tag parity bits" ),
('M_CKDATACKSUMREADS',
0x00800000, "Check data checksums on reads" ),
('M_CKDATACKSUMS', 0x00800000, "Check data checksums on reads" ),
('M_MKCONSISTENT', 0x00000100, "Make the filesystem consistent" ),
('M_LOOKAHEAD', 0x00000200, "Populate lookahead buffer" ),
@@ -108,8 +106,7 @@ FLAGS = [
('I_CKPROGS', 0x00080000, "Mounted with LFS3_M_CKPROGS" ),
('I_CKFETCHES', 0x00100000, "Mounted with LFS3_M_CKFETCHES" ),
('I_CKMETAPARITY', 0x00200000, "Mounted with LFS3_M_CKMETAPARITY" ),
('I_CKDATACKSUMREADS',
0x00800000, "Mounted with LFS3_M_CKDATACKSUMREADS" ),
('I_CKDATACKSUMS', 0x00800000, "Mounted with LFS3_M_CKDATACKSUMS" ),
('I_MKCONSISTENT', 0x00000100, "Filesystem needs mkconsistent to write" ),
('I_LOOKAHEAD', 0x00000200, "Lookahead buffer is not full" ),
tests/test_ck.toml
+45 -45
View File
@@ -2582,7 +2582,7 @@ defines.BADBLOCK_BEHAVIOR = [
]
# this should create a single block file
defines.SIZE = 'BLOCK_SIZE'
ifdef = 'LFS3_CKDATACKSUMREADS'
ifdef = 'LFS3_CKDATACKSUMS'
code = '''
// first we need to figure out where the data block will actually
// end up, fortunately our block randomization is intentionally
@@ -2590,8 +2590,8 @@ code = '''
// format
lfs3_t lfs3;
lfs3_format(&lfs3, LFS3_F_RDWR | LFS3_F_CKDATACKSUMREADS, CFG) => 0;
lfs3_mount(&lfs3, LFS3_M_RDWR | LFS3_M_CKDATACKSUMREADS, CFG) => 0;
lfs3_format(&lfs3, LFS3_F_RDWR | LFS3_F_CKDATACKSUMS, CFG) => 0;
lfs3_mount(&lfs3, LFS3_M_RDWR | LFS3_M_CKDATACKSUMS, CFG) => 0;
// create a file
lfs3_file_t file;
@@ -2641,8 +2641,8 @@ code = '''
// format
lfs3_t lfs3;
lfs3_format(&lfs3, LFS3_F_RDWR | LFS3_F_CKDATACKSUMREADS, CFG) => 0;
lfs3_mount(&lfs3, LFS3_M_RDWR | LFS3_M_CKDATACKSUMREADS, CFG) => 0;
lfs3_format(&lfs3, LFS3_F_RDWR | LFS3_F_CKDATACKSUMS, CFG) => 0;
lfs3_mount(&lfs3, LFS3_M_RDWR | LFS3_M_CKDATACKSUMS, CFG) => 0;
{
// create a file
@@ -2671,7 +2671,7 @@ code = '''
if (remount) {
lfs3_unmount(&lfs3) => 0;
lfs3_mount(&lfs3,
LFS3_M_RDWR | LFS3_M_CKDATACKSUMREADS,
LFS3_M_RDWR | LFS3_M_CKDATACKSUMS,
CFG) => 0;
}
@@ -2742,7 +2742,7 @@ defines.MTREEONLY = 'METHOD == 2'
defines.CKPROGS = 'METHOD == 0'
defines.CKFETCHES = 'METHOD == 2'
defines.CKMETAPARITY = false
defines.CKDATACKSUMREADS = 'METHOD == 3'
defines.CKDATACKSUMS = 'METHOD == 3'
defines.N = [1, 2, 4, 8, 16, 32, 64, 128, 256]
defines.SEED = 'range(10)'
fuzz = 'SEED'
@@ -2750,7 +2750,7 @@ if = [
'LFS3_IFDEF_CKPROGS(true, !CKPROGS)',
'LFS3_IFDEF_CKFETCHES(true, !CKFETCHES)',
'LFS3_IFDEF_CKMETAPARITY(true, !CKMETAPARITY)',
'LFS3_IFDEF_CKDATACKSUMREADS(true, !CKDATACKSUMREADS)',
'LFS3_IFDEF_CKDATACKSUMS(true, !CKDATACKSUMS)',
]
code = '''
// seed our block device with our seed so we have different error
@@ -2774,8 +2774,8 @@ code = '''
| ((CKMETAPARITY)
? LFS3_IFDEF_CKMETAPARITY(LFS3_F_CKMETAPARITY, -1)
: 0)
| ((CKDATACKSUMREADS)
? LFS3_IFDEF_CKDATACKSUMREADS(LFS3_F_CKDATACKSUMREADS, -1)
| ((CKDATACKSUMS)
? LFS3_IFDEF_CKDATACKSUMS(LFS3_F_CKDATACKSUMS, -1)
: 0),
CFG) => 0;
lfs3_mount(&lfs3,
@@ -2785,8 +2785,8 @@ code = '''
| ((CKMETAPARITY)
? LFS3_IFDEF_CKMETAPARITY(LFS3_M_CKMETAPARITY, -1)
: 0)
| ((CKDATACKSUMREADS)
? LFS3_IFDEF_CKDATACKSUMREADS(LFS3_M_CKDATACKSUMREADS, -1)
| ((CKDATACKSUMS)
? LFS3_IFDEF_CKDATACKSUMS(LFS3_M_CKDATACKSUMS, -1)
: 0),
CFG) => 0;
@@ -2968,9 +2968,9 @@ code = '''
| ((CKMETAPARITY)
? LFS3_IFDEF_CKMETAPARITY(LFS3_M_CKMETAPARITY, -1)
: 0)
| ((CKDATACKSUMREADS)
? LFS3_IFDEF_CKDATACKSUMREADS(
LFS3_M_CKDATACKSUMREADS,
| ((CKDATACKSUMS)
? LFS3_IFDEF_CKDATACKSUMS(
LFS3_M_CKDATACKSUMS,
-1)
: 0),
CFG) => 0;
@@ -3049,7 +3049,7 @@ defines.MTREEONLY = 'METHOD == 2'
defines.CKPROGS = 'METHOD == 0'
defines.CKFETCHES = 'METHOD == 2'
defines.CKMETAPARITY = false
defines.CKDATACKSUMREADS = 'METHOD == 3'
defines.CKDATACKSUMS = 'METHOD == 3'
defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [
'0',
@@ -3066,7 +3066,7 @@ if = [
'LFS3_IFDEF_CKPROGS(true, !CKPROGS)',
'LFS3_IFDEF_CKFETCHES(true, !CKFETCHES)',
'LFS3_IFDEF_CKMETAPARITY(true, !CKMETAPARITY)',
'LFS3_IFDEF_CKDATACKSUMREADS(true, !CKDATACKSUMREADS)',
'LFS3_IFDEF_CKDATACKSUMS(true, !CKDATACKSUMS)',
'(SIZE*N)/BLOCK_SIZE <= 16',
]
code = '''
@@ -3091,8 +3091,8 @@ code = '''
| ((CKMETAPARITY)
? LFS3_IFDEF_CKMETAPARITY(LFS3_F_CKMETAPARITY, -1)
: 0)
| ((CKDATACKSUMREADS)
? LFS3_IFDEF_CKDATACKSUMREADS(LFS3_F_CKDATACKSUMREADS, -1)
| ((CKDATACKSUMS)
? LFS3_IFDEF_CKDATACKSUMS(LFS3_F_CKDATACKSUMS, -1)
: 0),
CFG) => 0;
lfs3_mount(&lfs3,
@@ -3102,8 +3102,8 @@ code = '''
| ((CKMETAPARITY)
? LFS3_IFDEF_CKMETAPARITY(LFS3_M_CKMETAPARITY, -1)
: 0)
| ((CKDATACKSUMREADS)
? LFS3_IFDEF_CKDATACKSUMREADS(LFS3_M_CKDATACKSUMREADS, -1)
| ((CKDATACKSUMS)
? LFS3_IFDEF_CKDATACKSUMS(LFS3_M_CKDATACKSUMS, -1)
: 0),
CFG) => 0;
@@ -3332,9 +3332,9 @@ code = '''
| ((CKMETAPARITY)
? LFS3_IFDEF_CKMETAPARITY(LFS3_M_CKMETAPARITY, -1)
: 0)
| ((CKDATACKSUMREADS)
? LFS3_IFDEF_CKDATACKSUMREADS(
LFS3_M_CKDATACKSUMREADS,
| ((CKDATACKSUMS)
? LFS3_IFDEF_CKDATACKSUMS(
LFS3_M_CKDATACKSUMS,
-1)
: 0),
CFG) => 0;
@@ -3436,7 +3436,7 @@ defines.MTREEONLY = false
defines.CKPROGS = 'METHOD == 0'
defines.CKFETCHES = 'METHOD == 2'
defines.CKMETAPARITY = false
defines.CKDATACKSUMREADS = 'METHOD == 3'
defines.CKDATACKSUMS = 'METHOD == 3'
defines.SIZE = [
'FILE_CACHE_SIZE/2',
'2*FILE_CACHE_SIZE',
@@ -3458,7 +3458,7 @@ if = [
'LFS3_IFDEF_CKPROGS(true, !CKPROGS)',
'LFS3_IFDEF_CKFETCHES(true, !CKFETCHES)',
'LFS3_IFDEF_CKMETAPARITY(true, !CKMETAPARITY)',
'LFS3_IFDEF_CKDATACKSUMREADS(true, !CKDATACKSUMREADS)',
'LFS3_IFDEF_CKDATACKSUMS(true, !CKDATACKSUMS)',
'CHUNK <= SIZE',
# this just saves testing time
'SIZE <= 4*1024*FRAGMENT_SIZE',
@@ -3485,8 +3485,8 @@ code = '''
| ((CKMETAPARITY)
? LFS3_IFDEF_CKMETAPARITY(LFS3_F_CKMETAPARITY, -1)
: 0)
| ((CKDATACKSUMREADS)
? LFS3_IFDEF_CKDATACKSUMREADS(LFS3_F_CKDATACKSUMREADS, -1)
| ((CKDATACKSUMS)
? LFS3_IFDEF_CKDATACKSUMS(LFS3_F_CKDATACKSUMS, -1)
: 0),
CFG) => 0;
lfs3_mount(&lfs3,
@@ -3496,8 +3496,8 @@ code = '''
| ((CKMETAPARITY)
? LFS3_IFDEF_CKMETAPARITY(LFS3_M_CKMETAPARITY, -1)
: 0)
| ((CKDATACKSUMREADS)
? LFS3_IFDEF_CKDATACKSUMREADS(LFS3_M_CKDATACKSUMREADS, -1)
| ((CKDATACKSUMS)
? LFS3_IFDEF_CKDATACKSUMS(LFS3_M_CKDATACKSUMS, -1)
: 0),
CFG) => 0;
@@ -3653,9 +3653,9 @@ code = '''
| ((CKMETAPARITY)
? LFS3_IFDEF_CKMETAPARITY(LFS3_M_CKMETAPARITY, -1)
: 0)
| ((CKDATACKSUMREADS)
? LFS3_IFDEF_CKDATACKSUMREADS(
LFS3_M_CKDATACKSUMREADS,
| ((CKDATACKSUMS)
? LFS3_IFDEF_CKDATACKSUMS(
LFS3_M_CKDATACKSUMS,
-1)
: 0),
CFG) => 0;
@@ -3737,7 +3737,7 @@ defines.MTREEONLY = false
defines.CKPROGS = 'METHOD == 0'
defines.CKFETCHES = 'METHOD == 2'
defines.CKMETAPARITY = false
defines.CKDATACKSUMREADS = 'METHOD == 3'
defines.CKDATACKSUMS = 'METHOD == 3'
defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [
'0',
@@ -3754,7 +3754,7 @@ if = [
'LFS3_IFDEF_CKPROGS(true, !CKPROGS)',
'LFS3_IFDEF_CKFETCHES(true, !CKFETCHES)',
'LFS3_IFDEF_CKMETAPARITY(true, !CKMETAPARITY)',
'LFS3_IFDEF_CKDATACKSUMREADS(true, !CKDATACKSUMREADS)',
'LFS3_IFDEF_CKDATACKSUMS(true, !CKDATACKSUMS)',
'(SIZE*N)/BLOCK_SIZE <= 16',
]
code = '''
@@ -3779,8 +3779,8 @@ code = '''
| ((CKMETAPARITY)
? LFS3_IFDEF_CKMETAPARITY(LFS3_F_CKMETAPARITY, -1)
: 0)
| ((CKDATACKSUMREADS)
? LFS3_IFDEF_CKDATACKSUMREADS(LFS3_F_CKDATACKSUMREADS, -1)
| ((CKDATACKSUMS)
? LFS3_IFDEF_CKDATACKSUMS(LFS3_F_CKDATACKSUMS, -1)
: 0),
CFG) => 0;
lfs3_mount(&lfs3,
@@ -3790,8 +3790,8 @@ code = '''
| ((CKMETAPARITY)
? LFS3_IFDEF_CKMETAPARITY(LFS3_M_CKMETAPARITY, -1)
: 0)
| ((CKDATACKSUMREADS)
? LFS3_IFDEF_CKDATACKSUMREADS(LFS3_M_CKDATACKSUMREADS, -1)
| ((CKDATACKSUMS)
? LFS3_IFDEF_CKDATACKSUMS(LFS3_M_CKDATACKSUMS, -1)
: 0),
CFG) => 0;
@@ -4336,7 +4336,7 @@ defines.MTREEONLY = false
defines.CKPROGS = 'METHOD == 0'
defines.CKFETCHES = 'METHOD == 2'
defines.CKMETAPARITY = false
defines.CKDATACKSUMREADS = 'METHOD == 3'
defines.CKDATACKSUMS = 'METHOD == 3'
defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [
'0',
@@ -4353,7 +4353,7 @@ if = [
'LFS3_IFDEF_CKPROGS(true, !CKPROGS)',
'LFS3_IFDEF_CKFETCHES(true, !CKFETCHES)',
'LFS3_IFDEF_CKMETAPARITY(true, !CKMETAPARITY)',
'LFS3_IFDEF_CKDATACKSUMREADS(true, !CKDATACKSUMREADS)',
'LFS3_IFDEF_CKDATACKSUMS(true, !CKDATACKSUMS)',
'(SIZE*N)/BLOCK_SIZE <= 16',
]
code = '''
@@ -4378,8 +4378,8 @@ code = '''
| ((CKMETAPARITY)
? LFS3_IFDEF_CKMETAPARITY(LFS3_F_CKMETAPARITY, -1)
: 0)
| ((CKDATACKSUMREADS)
? LFS3_IFDEF_CKDATACKSUMREADS(LFS3_F_CKDATACKSUMREADS, -1)
| ((CKDATACKSUMS)
? LFS3_IFDEF_CKDATACKSUMS(LFS3_F_CKDATACKSUMS, -1)
: 0),
CFG) => 0;
lfs3_mount(&lfs3,
@@ -4389,8 +4389,8 @@ code = '''
| ((CKMETAPARITY)
? LFS3_IFDEF_CKMETAPARITY(LFS3_M_CKMETAPARITY, -1)
: 0)
| ((CKDATACKSUMREADS)
? LFS3_IFDEF_CKDATACKSUMREADS(LFS3_M_CKDATACKSUMREADS, -1)
| ((CKDATACKSUMS)
? LFS3_IFDEF_CKDATACKSUMS(LFS3_M_CKDATACKSUMS, -1)
: 0),
CFG) => 0;
tests/test_mount.toml
+10 -10
View File
@@ -22,7 +22,7 @@ defines.REVNOISE = [false, true]
defines.CKPROGS = [false, true]
defines.CKFETCHES = [false, true]
defines.CKMETAPARITY = [false, true]
defines.CKDATACKSUMREADS = [false, true]
defines.CKDATACKSUMS = [false, true]
defines.MKCONSISTENT = [false, true]
defines.LOOKAHEAD = [false, true]
defines.COMPACT = [false, true]
@@ -35,7 +35,7 @@ if = [
'LFS3_IFDEF_CKPROGS(true, !CKPROGS)',
'LFS3_IFDEF_CKFETCHES(true, !CKFETCHES)',
'LFS3_IFDEF_CKMETAPARITY(true, !CKMETAPARITY)',
'LFS3_IFDEF_CKDATACKSUMREADS(true, !CKDATACKSUMREADS)',
'LFS3_IFDEF_CKDATACKSUMS(true, !CKDATACKSUMS)',
'!RDONLY || !MKCONSISTENT',
'!RDONLY || !LOOKAHEAD',
'!RDONLY || !COMPACT',
@@ -54,8 +54,8 @@ code = '''
| ((CKMETAPARITY)
? LFS3_IFDEF_CKMETAPARITY(LFS3_M_CKMETAPARITY, -1)
: 0)
| ((CKDATACKSUMREADS)
? LFS3_IFDEF_CKDATACKSUMREADS(LFS3_M_CKDATACKSUMREADS, -1)
| ((CKDATACKSUMS)
? LFS3_IFDEF_CKDATACKSUMS(LFS3_M_CKDATACKSUMS, -1)
: 0)
| ((MKCONSISTENT) ? LFS3_M_MKCONSISTENT : 0)
| ((LOOKAHEAD) ? LFS3_M_LOOKAHEAD : 0)
@@ -78,8 +78,8 @@ code = '''
| ((CKMETAPARITY)
? LFS3_IFDEF_CKMETAPARITY(LFS3_I_CKMETAPARITY, -1)
: 0)
| ((CKDATACKSUMREADS)
? LFS3_IFDEF_CKDATACKSUMREADS(LFS3_I_CKDATACKSUMREADS, -1)
| ((CKDATACKSUMS)
? LFS3_IFDEF_CKDATACKSUMS(LFS3_I_CKDATACKSUMS, -1)
: 0)
| ((!MKCONSISTENT) ? LFS3_I_MKCONSISTENT : 0)
| ((!LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0)
@@ -100,7 +100,7 @@ defines.REVNOISE = [false, true]
defines.CKPROGS = [false, true]
defines.CKFETCHES = [false, true]
defines.CKMETAPARITY = [false, true]
defines.CKDATACKSUMREADS = [false, true]
defines.CKDATACKSUMS = [false, true]
defines.CKMETA = [false, true]
defines.CKDATA = [false, true]
if = [
@@ -110,7 +110,7 @@ if = [
'LFS3_IFDEF_CKPROGS(true, !CKPROGS)',
'LFS3_IFDEF_CKFETCHES(true, !CKFETCHES)',
'LFS3_IFDEF_CKMETAPARITY(true, !CKMETAPARITY)',
'LFS3_IFDEF_CKDATACKSUMREADS(true, !CKDATACKSUMREADS)',
'LFS3_IFDEF_CKDATACKSUMS(true, !CKDATACKSUMS)',
]
code = '''
lfs3_t lfs3;
@@ -123,8 +123,8 @@ code = '''
| ((CKMETAPARITY)
? LFS3_IFDEF_CKMETAPARITY(LFS3_F_CKMETAPARITY, -1)
: 0)
| ((CKDATACKSUMREADS)
? LFS3_IFDEF_CKDATACKSUMREADS(LFS3_F_CKDATACKSUMREADS, -1)
| ((CKDATACKSUMS)
? LFS3_IFDEF_CKDATACKSUMS(LFS3_F_CKDATACKSUMS, -1)
: 0)
| ((CKMETA) ? LFS3_F_CKMETA : 0)
| ((CKDATA) ? LFS3_F_CKDATA : 0),