Added format flags to lfsr_format
This is mainly to solve the weird check-hole where passing CKPROGS/
CKREADS as mount flags has no effect on lfsr_format (I mean, it'd be a
bit silly if it did somehow):
LFS_F_RDWR 0 // Format the filesystem as read and write
LFS_F_CKPROGS 0x00000010 // Check progs by reading back progged data
LFS_F_CKREADS 0x00000020 // Check reads via parity bits/checksums
This makes lfsr_format a more cumbersome interface, but I don't know if
this is necessarily a bad thing. There's always risk of data loss when
calling lfsr_format, so maybe it should be a pain to call.
At the very least, format flags may be useful in the future for
enabling/disabling format-time things such as the planned block-map,
parity-tree, etc. Though it's unclear if such significant settings
should be format flags or somehow encoded as fields in our config
struct.
---
The LFS_F_* format flags of course ended up conflicting with our
internal LFS_F_* flags, so I renamed most of the internal flags to match
the closest flag set they participate in:
- LFS_F_TYPE -> LFS_O_TYPE
- LFS_F_UNFLUSH -> LFS_O_UNFLUSH
- LFS_F_UNSYNC -> LFS_O_UNSYNC
- LFS_F_ORPHAN -> LFS_O_ORPHAN
- LFS_F_ZOMBIE -> LFS_O_ZOMBIE
- LFS_F_ORPHANS -> LFS_I_ORPHANS
- LFS_F_UNCOMPACTED -> LFS_I_UNCOMPACTED
- LFS_F_TSTATE -> LFS_T_TSTATE
- LFS_F_BTYPE -> LFS_T_BTYPE
- LFS_F_DIRTY -> LFS_T_DIRTY
- LFS_F_MUTATED -> LFS_T_MUTATED
This may make it a bit less clear which flags are a part of the public
API, vs intended only for internal use, but at the very least our asserts
in format/mount/open/etc should catch most of these mistakes.
---
Code cost ended up being pretty minimal. Actually negative. This is the
second time we're _adding_ a feature that somehow saves code, though the
reality for this one is we're really just pushing constants up into the
user's stack frame. Still, it's a good indication the cost of format
flags is small:
code stack
before: 36452 2680
after: 36448 (-0.0%) 2680 (+0.0%)
This commit is contained in:
+12
-12
@@ -5,7 +5,7 @@ after = 'test_dirs'
|
||||
[cases.test_paths_normal]
|
||||
code = '''
|
||||
lfs_t lfs;
|
||||
lfsr_format(&lfs, CFG) => 0;
|
||||
lfsr_format(&lfs, LFS_F_RDWR, CFG) => 0;
|
||||
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
|
||||
lfsr_mkdir(&lfs, "tea") => 0;
|
||||
lfsr_mkdir(&lfs, "tea/green") => 0;
|
||||
@@ -30,7 +30,7 @@ code = '''
|
||||
[cases.test_paths_redundant_slashes]
|
||||
code = '''
|
||||
lfs_t lfs;
|
||||
lfsr_format(&lfs, CFG) => 0;
|
||||
lfsr_format(&lfs, LFS_F_RDWR, CFG) => 0;
|
||||
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
|
||||
lfsr_mkdir(&lfs, "tea") => 0;
|
||||
lfsr_mkdir(&lfs, "tea/green") => 0;
|
||||
@@ -57,7 +57,7 @@ code = '''
|
||||
[cases.test_paths_dot]
|
||||
code = '''
|
||||
lfs_t lfs;
|
||||
lfsr_format(&lfs, CFG) => 0;
|
||||
lfsr_format(&lfs, LFS_F_RDWR, CFG) => 0;
|
||||
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
|
||||
lfsr_mkdir(&lfs, "tea") => 0;
|
||||
lfsr_mkdir(&lfs, "tea/green") => 0;
|
||||
@@ -86,7 +86,7 @@ code = '''
|
||||
[cases.test_paths_dot_dot]
|
||||
code = '''
|
||||
lfs_t lfs;
|
||||
lfsr_format(&lfs, CFG) => 0;
|
||||
lfsr_format(&lfs, LFS_F_RDWR, CFG) => 0;
|
||||
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
|
||||
lfsr_mkdir(&lfs, "tea") => 0;
|
||||
lfsr_mkdir(&lfs, "tea/green") => 0;
|
||||
@@ -119,7 +119,7 @@ code = '''
|
||||
[cases.test_paths_trailing_dot]
|
||||
code = '''
|
||||
lfs_t lfs;
|
||||
lfsr_format(&lfs, CFG) => 0;
|
||||
lfsr_format(&lfs, LFS_F_RDWR, CFG) => 0;
|
||||
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
|
||||
lfsr_mkdir(&lfs, "tea") => 0;
|
||||
lfsr_mkdir(&lfs, "tea/green") => 0;
|
||||
@@ -144,7 +144,7 @@ code = '''
|
||||
[cases.test_paths_leading_dot]
|
||||
code = '''
|
||||
lfs_t lfs;
|
||||
lfsr_format(&lfs, CFG) => 0;
|
||||
lfsr_format(&lfs, LFS_F_RDWR, CFG) => 0;
|
||||
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
|
||||
lfsr_mkdir(&lfs, ".milk") => 0;
|
||||
struct lfs_info info;
|
||||
@@ -159,7 +159,7 @@ code = '''
|
||||
[cases.test_paths_root_dot_dot]
|
||||
code = '''
|
||||
lfs_t lfs;
|
||||
lfsr_format(&lfs, CFG) => 0;
|
||||
lfsr_format(&lfs, LFS_F_RDWR, CFG) => 0;
|
||||
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
|
||||
lfsr_mkdir(&lfs, "tea") => 0;
|
||||
lfsr_mkdir(&lfs, "tea/green") => 0;
|
||||
@@ -186,7 +186,7 @@ code = '''
|
||||
[cases.test_paths_invalid]
|
||||
code = '''
|
||||
lfs_t lfs;
|
||||
lfsr_format(&lfs, CFG);
|
||||
lfsr_format(&lfs, LFS_F_RDWR, CFG) => 0;
|
||||
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
|
||||
struct lfs_info info;
|
||||
lfsr_stat(&lfs, "milk", &info) => LFS_ERR_NOENT;
|
||||
@@ -211,7 +211,7 @@ code = '''
|
||||
[cases.test_paths_root]
|
||||
code = '''
|
||||
lfs_t lfs;
|
||||
lfsr_format(&lfs, CFG) => 0;
|
||||
lfsr_format(&lfs, LFS_F_RDWR, CFG) => 0;
|
||||
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
|
||||
struct lfs_info info;
|
||||
lfsr_stat(&lfs, "/", &info) => 0;
|
||||
@@ -232,7 +232,7 @@ code = '''
|
||||
[cases.test_paths_root_reprs]
|
||||
code = '''
|
||||
lfs_t lfs;
|
||||
lfsr_format(&lfs, CFG) => 0;
|
||||
lfsr_format(&lfs, LFS_F_RDWR, CFG) => 0;
|
||||
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
|
||||
struct lfs_info info;
|
||||
lfsr_stat(&lfs, "/", &info) => 0;
|
||||
@@ -266,7 +266,7 @@ code = '''
|
||||
[cases.test_paths_max]
|
||||
code = '''
|
||||
lfs_t lfs;
|
||||
lfsr_format(&lfs, CFG) => 0;
|
||||
lfsr_format(&lfs, LFS_F_RDWR, CFG) => 0;
|
||||
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
|
||||
lfsr_mkdir(&lfs, "coffee") => 0;
|
||||
lfsr_mkdir(&lfs, "coffee/drip") => 0;
|
||||
@@ -294,7 +294,7 @@ code = '''
|
||||
[cases.test_paths_really_big]
|
||||
code = '''
|
||||
lfs_t lfs;
|
||||
lfsr_format(&lfs, CFG) => 0;
|
||||
lfsr_format(&lfs, LFS_F_RDWR, CFG) => 0;
|
||||
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
|
||||
lfsr_mkdir(&lfs, "coffee") => 0;
|
||||
lfsr_mkdir(&lfs, "coffee/drip") => 0;
|
||||
|
||||
Reference in New Issue
Block a user