Github/littlefs
1
Fork 0
Code Actions Activity

Reverted bptr -> bptr_ in mtree traverse/gc functions

Browse Source 
This was missed when reverting the trailing underscores_ in other
unconditional out-pointers.

The trailing underscore now just hints at the parameter being an
out-pointer, optionality is no longer implied.
This commit is contained in:
Christopher Haster
2025-07-16 12:53:53 -05:00
parent 55cc661283
commit 2d10a61732
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs3.c
+18 -18
View File
@@ -9782,7 +9782,7 @@ static void lfs3_traversal_init(lfs3_traversal_t *t, uint32_t flags) {
// low-level traversal _only_ finds blocks // low-level traversal _only_ finds blocks
static int lfs3_mtree_traverse_(lfs3_t *lfs3, lfs3_traversal_t *t, static int lfs3_mtree_traverse_(lfs3_t *lfs3, lfs3_traversal_t *t,
lfs3_tag_t *tag_, lfs3_bptr_t *bptr) { lfs3_tag_t *tag_, lfs3_bptr_t *bptr_) {
while (true) { while (true) {
switch (lfs3_t_tstate(t->b.o.flags)) { switch (lfs3_t_tstate(t->b.o.flags)) {
// start with the mrootanchor 0x{0,1} // start with the mrootanchor 0x{0,1}
@@ -9805,7 +9805,7 @@ static int lfs3_mtree_traverse_(lfs3_t *lfs3, lfs3_traversal_t *t,
if (tag_) { if (tag_) {
*tag_ = LFS3_TAG_MDIR; *tag_ = LFS3_TAG_MDIR;
} }
bptr->d.u.buffer = (const uint8_t*)&t->b.o.mdir; bptr_->d.u.buffer = (const uint8_t*)&t->b.o.mdir;
return 0; return 0;
// traverse the mroot chain, checking for mroots/mtrees // traverse the mroot chain, checking for mroots/mtrees
@@ -9863,7 +9863,7 @@ static int lfs3_mtree_traverse_(lfs3_t *lfs3, lfs3_traversal_t *t,
if (tag_) { if (tag_) {
*tag_ = LFS3_TAG_MDIR; *tag_ = LFS3_TAG_MDIR;
} }
bptr->d.u.buffer = (const uint8_t*)&t->b.o.mdir; bptr_->d.u.buffer = (const uint8_t*)&t->b.o.mdir;
return 0; return 0;
// found an mtree? // found an mtree?
@@ -9908,7 +9908,7 @@ static int lfs3_mtree_traverse_(lfs3_t *lfs3, lfs3_traversal_t *t,
if (tag_) { if (tag_) {
*tag_ = LFS3_TAG_MDIR; *tag_ = LFS3_TAG_MDIR;
} }
bptr->d.u.buffer = (const uint8_t*)&t->b.o.mdir; bptr_->d.u.buffer = (const uint8_t*)&t->b.o.mdir;
return 0; return 0;
#endif #endif
@@ -10029,7 +10029,7 @@ static int lfs3_mtree_traverse_(lfs3_t *lfs3, lfs3_traversal_t *t,
if (tag_) { if (tag_) {
*tag_ = tag; *tag_ = tag;
} }
bptr->d = data; bptr_->d = data;
return 0; return 0;
// found an indirect block? // found an indirect block?
@@ -10039,7 +10039,7 @@ static int lfs3_mtree_traverse_(lfs3_t *lfs3, lfs3_traversal_t *t,
*tag_ = tag; *tag_ = tag;
} }
err = lfs3_data_readbptr(lfs3, &data, err = lfs3_data_readbptr(lfs3, &data,
bptr); bptr_);
if (err) { if (err) {
return err; return err;
} }
@@ -10061,16 +10061,16 @@ static int lfs3_mtree_traverse_(lfs3_t *lfs3, lfs3_traversal_t *t,
// needed in lfs3_mtree_traverse // needed in lfs3_mtree_traverse
static void lfs3_alloc_markinuse(lfs3_t *lfs3, static void lfs3_alloc_markinuse(lfs3_t *lfs3,
lfs3_tag_t tag, const lfs3_bptr_t *bptr); lfs3_tag_t tag, const lfs3_bptr_t *bptr_);
// high-level immutable traversal, handle extra features here, // high-level immutable traversal, handle extra features here,
// but no mutation! (we're called in lfs3_alloc, so things would end up // but no mutation! (we're called in lfs3_alloc, so things would end up
// recursive, which would be a bit bad!) // recursive, which would be a bit bad!)
static int lfs3_mtree_traverse(lfs3_t *lfs3, lfs3_traversal_t *t, static int lfs3_mtree_traverse(lfs3_t *lfs3, lfs3_traversal_t *t,
lfs3_tag_t *tag_, lfs3_bptr_t *bptr) { lfs3_tag_t *tag_, lfs3_bptr_t *bptr_) {
lfs3_tag_t tag; lfs3_tag_t tag;
int err = lfs3_mtree_traverse_(lfs3, t, int err = lfs3_mtree_traverse_(lfs3, t,
&tag, bptr); &tag, bptr_);
if (err) { if (err) {
// end of traversal? // end of traversal?
if (err == LFS3_ERR_NOENT) { if (err == LFS3_ERR_NOENT) {
@@ -10092,7 +10092,7 @@ static int lfs3_mtree_traverse(lfs3_t *lfs3, lfs3_traversal_t *t,
if ((lfs3_t_isckmeta(t->b.o.flags) if ((lfs3_t_isckmeta(t->b.o.flags)
|| lfs3_t_isckdata(t->b.o.flags)) || lfs3_t_isckdata(t->b.o.flags))
&& tag == LFS3_TAG_MDIR) { && tag == LFS3_TAG_MDIR) {
lfs3_mdir_t *mdir = (lfs3_mdir_t*)bptr->d.u.buffer; lfs3_mdir_t *mdir = (lfs3_mdir_t*)bptr_->d.u.buffer;
// check cksum matches our mroot // check cksum matches our mroot
if (lfs3_mdir_cmp(mdir, &lfs3->mroot) == 0 if (lfs3_mdir_cmp(mdir, &lfs3->mroot) == 0
@@ -10135,7 +10135,7 @@ static int lfs3_mtree_traverse(lfs3_t *lfs3, lfs3_traversal_t *t,
if ((lfs3_t_isckmeta(t->b.o.flags) if ((lfs3_t_isckmeta(t->b.o.flags)
|| lfs3_t_isckdata(t->b.o.flags)) || lfs3_t_isckdata(t->b.o.flags))
&& tag == LFS3_TAG_BRANCH) { && tag == LFS3_TAG_BRANCH) {
lfs3_rbyd_t *rbyd = (lfs3_rbyd_t*)bptr->d.u.buffer; lfs3_rbyd_t *rbyd = (lfs3_rbyd_t*)bptr_->d.u.buffer;
err = lfs3_rbyd_fetchck(lfs3, rbyd, err = lfs3_rbyd_fetchck(lfs3, rbyd,
rbyd->blocks[0], rbyd->trunk, rbyd->blocks[0], rbyd->trunk,
rbyd->cksum); rbyd->cksum);
@@ -10148,7 +10148,7 @@ static int lfs3_mtree_traverse(lfs3_t *lfs3, lfs3_traversal_t *t,
#ifndef LFS3_2BONLY #ifndef LFS3_2BONLY
if (lfs3_t_isckdata(t->b.o.flags) if (lfs3_t_isckdata(t->b.o.flags)
&& tag == LFS3_TAG_BLOCK) { && tag == LFS3_TAG_BLOCK) {
err = lfs3_bptr_ck(lfs3, bptr); err = lfs3_bptr_ck(lfs3, bptr_);
if (err) { if (err) {
return err; return err;
} }
@@ -10200,11 +10200,11 @@ static void lfs3_alloc_markfree(lfs3_t *lfs3);
// high-level mutating traversal, handle extra features that require // high-level mutating traversal, handle extra features that require
// mutation here, upper layers should call lfs3_alloc_ckpoint as needed // mutation here, upper layers should call lfs3_alloc_ckpoint as needed
static int lfs3_mtree_gc(lfs3_t *lfs3, lfs3_traversal_t *t, static int lfs3_mtree_gc(lfs3_t *lfs3, lfs3_traversal_t *t,
lfs3_tag_t *tag_, lfs3_bptr_t *bptr) { lfs3_tag_t *tag_, lfs3_bptr_t *bptr_) {
dropped:; dropped:;
lfs3_tag_t tag; lfs3_tag_t tag;
int err = lfs3_mtree_traverse(lfs3, t, int err = lfs3_mtree_traverse(lfs3, t,
&tag, bptr); &tag, bptr_);
if (err) { if (err) {
// end of traversal? // end of traversal?
if (err == LFS3_ERR_NOENT) { if (err == LFS3_ERR_NOENT) {
@@ -10222,7 +10222,7 @@ dropped:;
// track in-use blocks? // track in-use blocks?
#ifndef LFS3_2BONLY #ifndef LFS3_2BONLY
if (lfs3_t_islookahead(t->b.o.flags)) { if (lfs3_t_islookahead(t->b.o.flags)) {
lfs3_alloc_markinuse(lfs3, tag, bptr); lfs3_alloc_markinuse(lfs3, tag, bptr_);
} }
#endif #endif
@@ -10230,7 +10230,7 @@ dropped:;
if (lfs3_t_ismkconsistent(t->b.o.flags) if (lfs3_t_ismkconsistent(t->b.o.flags)
&& lfs3_t_ismkconsistent(lfs3->flags) && lfs3_t_ismkconsistent(lfs3->flags)
&& tag == LFS3_TAG_MDIR) { && tag == LFS3_TAG_MDIR) {
lfs3_mdir_t *mdir = (lfs3_mdir_t*)bptr->d.u.buffer; lfs3_mdir_t *mdir = (lfs3_mdir_t*)bptr_->d.u.buffer;
err = lfs3_mdir_mkconsistent(lfs3, mdir); err = lfs3_mdir_mkconsistent(lfs3, mdir);
if (err) { if (err) {
goto failed; goto failed;
@@ -10255,11 +10255,11 @@ dropped:;
if (lfs3_t_iscompact(t->b.o.flags) if (lfs3_t_iscompact(t->b.o.flags)
&& tag == LFS3_TAG_MDIR && tag == LFS3_TAG_MDIR
// exceed compaction threshold? // exceed compaction threshold?
&& lfs3_rbyd_eoff(&((lfs3_mdir_t*)bptr->d.u.buffer)->r) && lfs3_rbyd_eoff(&((lfs3_mdir_t*)bptr_->d.u.buffer)->r)
> ((lfs3->cfg->gc_compact_thresh) > ((lfs3->cfg->gc_compact_thresh)
? lfs3->cfg->gc_compact_thresh ? lfs3->cfg->gc_compact_thresh
: lfs3->cfg->block_size - lfs3->cfg->block_size/8)) { : lfs3->cfg->block_size - lfs3->cfg->block_size/8)) {
lfs3_mdir_t *mdir = (lfs3_mdir_t*)bptr->d.u.buffer; lfs3_mdir_t *mdir = (lfs3_mdir_t*)bptr_->d.u.buffer;
LFS3_INFO("Compacting mdir %"PRId32" 0x{%"PRIx32",%"PRIx32"} " LFS3_INFO("Compacting mdir %"PRId32" 0x{%"PRIx32",%"PRIx32"} "
"(%"PRId32" > %"PRId32")", "(%"PRId32" > %"PRId32")",
lfs3_dbgmbid(lfs3, mdir->mid), lfs3_dbgmbid(lfs3, mdir->mid),