Github/littlefs
1
Fork 0
Code Actions Activity

Dropped weight from lfsr_rbyd_fetchvalidate

Browse Source 
We really only rely on cksum here.

Passing weight was useful for an assert, but it clutters up the function
call with a parameter that isn't used normally.

Removing ths saves a bit of code:

           code          stack
  before: 33670           2592
  after:  33654 (-0.0%)   2592 (+0.0%)
This commit is contained in:
Christopher Haster
2024-06-10 02:41:34 -05:00
parent 9c2c101e7f
commit 4da5ad0459
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs.c
+3 -6
View File
@@ -2350,7 +2350,7 @@ static int lfsr_rbyd_fetch(lfs_t *lfs, lfsr_rbyd_t *rbyd,
// a more aggressive fetch when checksum is known // a more aggressive fetch when checksum is known
static int lfsr_rbyd_fetchvalidate(lfs_t *lfs, lfsr_rbyd_t *rbyd, static int lfsr_rbyd_fetchvalidate(lfs_t *lfs, lfsr_rbyd_t *rbyd,
lfs_block_t block, lfs_size_t trunk, lfsr_rid_t weight, lfs_block_t block, lfs_size_t trunk,
uint32_t cksum) { uint32_t cksum) {
int err = lfsr_rbyd_fetch(lfs, rbyd, block, trunk); int err = lfsr_rbyd_fetch(lfs, rbyd, block, trunk);
if (err) { if (err) {
@@ -2377,7 +2377,6 @@ static int lfsr_rbyd_fetchvalidate(lfs_t *lfs, lfsr_rbyd_t *rbyd,
// if trunk/weight mismatch _after_ cksums match, that's not a storage // if trunk/weight mismatch _after_ cksums match, that's not a storage
// error, that's a programming error // error, that's a programming error
LFS_ASSERT(lfsr_rbyd_trunk(rbyd) == trunk); LFS_ASSERT(lfsr_rbyd_trunk(rbyd) == trunk);
LFS_ASSERT(rbyd->weight == weight);
return 0; return 0;
} }
@@ -4347,7 +4346,7 @@ static int lfsr_btree_commit_(lfs_t *lfs, lfsr_btree_t *btree,
// a funny benefit is we cache the root of our btree this way // a funny benefit is we cache the root of our btree this way
if (!lfsr_rbyd_isfetched(&rbyd)) { if (!lfsr_rbyd_isfetched(&rbyd)) {
int err = lfsr_rbyd_fetchvalidate(lfs, &rbyd, int err = lfsr_rbyd_fetchvalidate(lfs, &rbyd,
rbyd.blocks[0], lfsr_rbyd_trunk(&rbyd), rbyd.weight, rbyd.blocks[0], lfsr_rbyd_trunk(&rbyd),
rbyd.cksum); rbyd.cksum);
if (err) { if (err) {
return err; return err;
@@ -7827,7 +7826,7 @@ static int lfsr_traversal_read(lfs_t *lfs, lfsr_traversal_t *t,
// match // match
if (lfsr_traversal_isvalidate(t)) { if (lfsr_traversal_isvalidate(t)) {
err = lfsr_rbyd_fetchvalidate(lfs, &mtree, err = lfsr_rbyd_fetchvalidate(lfs, &mtree,
mtree.blocks[0], mtree.trunk, mtree.weight, mtree.blocks[0], mtree.trunk,
mtree.cksum); mtree.cksum);
if (err) { if (err) {
return err; return err;
@@ -7891,7 +7890,6 @@ static int lfsr_traversal_read(lfs_t *lfs, lfsr_traversal_t *t,
if (lfsr_traversal_isvalidate(t)) { if (lfsr_traversal_isvalidate(t)) {
err = lfsr_rbyd_fetchvalidate(lfs, &tinfo.u.rbyd, err = lfsr_rbyd_fetchvalidate(lfs, &tinfo.u.rbyd,
tinfo.u.rbyd.blocks[0], tinfo.u.rbyd.trunk, tinfo.u.rbyd.blocks[0], tinfo.u.rbyd.trunk,
tinfo.u.rbyd.weight,
tinfo.u.rbyd.cksum); tinfo.u.rbyd.cksum);
if (err) { if (err) {
return err; return err;
@@ -8040,7 +8038,6 @@ static int lfsr_traversal_read(lfs_t *lfs, lfsr_traversal_t *t,
if (lfsr_traversal_isvalidate(t)) { if (lfsr_traversal_isvalidate(t)) {
err = lfsr_rbyd_fetchvalidate(lfs, &tinfo.u.rbyd, err = lfsr_rbyd_fetchvalidate(lfs, &tinfo.u.rbyd,
tinfo.u.rbyd.blocks[0], tinfo.u.rbyd.trunk, tinfo.u.rbyd.blocks[0], tinfo.u.rbyd.trunk,
tinfo.u.rbyd.weight,
tinfo.u.rbyd.cksum); tinfo.u.rbyd.cksum);
if (err) { if (err) {
return err; return err;