Github/littlefs
1
Fork 0
Code Actions Activity

Renamed LFS_I_ORPHANS -> LFS_I_HASORPHANS

Browse Source 
This better matches how other flags sometimes include the relevant verb,
LFS_RBYD_ISSHRUB, LFSR_DATA_ONDISK, etc, and feels a bit more
consistent.
This commit is contained in:
Christopher Haster
2024-08-12 15:42:05 -05:00
parent 6d0b05da6c
commit 80ef963bec
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_forphans.toml
+3 -3
View File
@@ -4701,7 +4701,7 @@ code = '''
// we should have cleaned up all grms/orphans
assert(lfs.grm.mids[0] == -1);
assert(lfs.grm.mids[1] == -1);
assert(!(lfs.flags & LFS_I_ORPHANS));
assert(!(lfs.flags & LFS_I_HASORPHANS));
struct lfs_fsinfo fsinfo;
lfsr_fs_stat(&lfs, &fsinfo) => 0;
@@ -4835,7 +4835,7 @@ code = '''
// we should have cleaned up all grms/orphans
assert(lfs.grm.mids[0] == -1);
assert(lfs.grm.mids[1] == -1);
assert(!(lfs.flags & LFS_I_ORPHANS));
assert(!(lfs.flags & LFS_I_HASORPHANS));
struct lfs_fsinfo fsinfo;
lfsr_fs_stat(&lfs, &fsinfo) => 0;
@@ -4983,7 +4983,7 @@ code = '''
// we should have cleaned up all grms/orphans
assert(lfs.grm.mids[0] == -1);
assert(lfs.grm.mids[1] == -1);
assert(!(lfs.flags & LFS_I_ORPHANS));
assert(!(lfs.flags & LFS_I_HASORPHANS));
struct lfs_fsinfo fsinfo;
lfsr_fs_stat(&lfs, &fsinfo) => 0;
tests/test_traversal.toml
+8 -8
View File
@@ -6327,7 +6327,7 @@ code = '''
// we should have cleaned up all grms/orphans
assert(lfs.grm.mids[0] == -1);
assert(lfs.grm.mids[1] == -1);
assert(!(lfs.flags & LFS_I_ORPHANS));
assert(!(lfs.flags & LFS_I_HASORPHANS));
// which means there shouldn't be that many files left
assert((lfs.mtree.u.weight & 0x7fffffff) <= (2 << lfs.mdir_bits));
@@ -6466,7 +6466,7 @@ code = '''
assert(lfs.grm.mids[1] == -1);
// if we introduce actual orphans, me _must not_ clear the orphan flag
if (ORPHANS >= 3) {
assert(lfs.flags & LFS_I_ORPHANS);
assert(lfs.flags & LFS_I_HASORPHANS);
}
// if we introduced actual orphans, we _must_ be marked as inconsistent
@@ -6618,7 +6618,7 @@ code = '''
// we should have cleaned up all grms/orphans
assert(lfs.grm.mids[0] == -1);
assert(lfs.grm.mids[1] == -1);
assert(!(lfs.flags & LFS_I_ORPHANS));
assert(!(lfs.flags & LFS_I_HASORPHANS));
// which means there shouldn't be that many files left
assert((lfs.mtree.u.weight & 0x7fffffff) <= (2 << lfs.mdir_bits));
@@ -6771,7 +6771,7 @@ code = '''
// we should have cleaned up all grms/orphans
assert(lfs.grm.mids[0] == -1);
assert(lfs.grm.mids[1] == -1);
assert(!(lfs.flags & LFS_I_ORPHANS));
assert(!(lfs.flags & LFS_I_HASORPHANS));
// which means there shouldn't be that many files left
assert((lfs.mtree.u.weight & 0x7fffffff) <= (2 << lfs.mdir_bits));
@@ -6935,7 +6935,7 @@ code = '''
// we should have cleaned up all grms/orphans
assert(lfs.grm.mids[0] == -1);
assert(lfs.grm.mids[1] == -1);
assert(!(lfs.flags & LFS_I_ORPHANS));
assert(!(lfs.flags & LFS_I_HASORPHANS));
// which means there shouldn't be that many files left
assert((lfs.mtree.u.weight & 0x7fffffff) <= (2 << lfs.mdir_bits));
@@ -7097,7 +7097,7 @@ code = '''
// we should have cleaned up all grms/orphans
assert(lfs.grm.mids[0] == -1);
assert(lfs.grm.mids[1] == -1);
assert(!(lfs.flags & LFS_I_ORPHANS));
assert(!(lfs.flags & LFS_I_HASORPHANS));
// which means there shouldn't be that many files left
assert((lfs.mtree.u.weight & 0x7fffffff) <= (2 << lfs.mdir_bits));
@@ -7257,7 +7257,7 @@ code = '''
// we should have cleaned up all grms/orphans
assert(lfs.grm.mids[0] == -1);
assert(lfs.grm.mids[1] == -1);
assert(!(lfs.flags & LFS_I_ORPHANS));
assert(!(lfs.flags & LFS_I_HASORPHANS));
// which means there shouldn't be that many files left
assert((lfs.mtree.u.weight & 0x7fffffff) <= (2 << lfs.mdir_bits));
@@ -7445,7 +7445,7 @@ code = '''
assert(lfs.grm.mids[1] == -1);
// if we introduce actual orphans, me _must not_ clear the orphan flag
if (ORPHANS >= 3) {
assert(lfs.flags & LFS_I_ORPHANS);
assert(lfs.flags & LFS_I_HASORPHANS);
}
// mdirs should have been compacted