From 7d9fe534d13a46f6e25b24408a7182285e83cbe0 Mon Sep 17 00:00:00 2001
From: Christopher Haster <geky@geky.net>
Date: Tue, 2 Dec 2025 01:03:59 -0600
Subject: [PATCH] A number of small mdir commit tweaks

- Adopted -2,-2 for unbounded lfs3_mdir_commit___ ranges that include
  gstate.

  Why not? We treat any negative upper bound as unbounded and it's a bit
  easier to read.

- Prefer <=-2 when checking for rid bounds that include gstate.

- Prefer <=-2 when checking for attached rattr weights.

- Cleaned up a couple outdated comments.

No code changes:

                 code          stack          ctx
  before:       35160           2136          660
  after:        35160 (+0.0%)   2136 (+0.0%)  660 (+0.0%)

                 code          stack          ctx
  gbmap before: 38020           2152          772
  gbmap after:  38020 (+0.0%)   2152 (+0.0%)  772 (+0.0%)
---
 lfs3.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/lfs3.c b/lfs3.c
index 44368541..695b1433 100644
--- a/lfs3.c
+++ b/lfs3.c
@@ -2007,7 +2007,7 @@ static inline bool lfs3_rattr_isgrow_(lfs3_rattr_t rattr) {
 #ifndef LFS3_RDONLY
 static inline lfs3_srid_t lfs3_rattr_weight(const lfs3_rattr_t *rattr) {
     lfs3_srid_t weight = lfs3_rattr_weight_(rattr[0]);
-    if (weight == -2) {
+    if (weight <= -2) {
         return rattr[1];
     } else {
         return weight;
@@ -2018,7 +2018,7 @@ static inline lfs3_srid_t lfs3_rattr_weight(const lfs3_rattr_t *rattr) {
 #ifndef LFS3_RDONLY
 static inline const lfs3_rattr_t *lfs3_rattr_args(const lfs3_rattr_t *rattr) {
     lfs3_srid_t weight = lfs3_rattr_weight_(rattr[0]);
-    if (weight == -2) {
+    if (weight <= -2) {
         return &rattr[2];
     } else {
         return &rattr[1];
@@ -8652,15 +8652,10 @@ static int lfs3_mdir_compact___(lfs3_t *lfs3,
     //
     // it's really tempting to deduplicate this via recursion! but we
     // can't do that here
-    //
-    // TODO this true?
-    // note that any inlined updates here depend on the pre-commit state
-    // (btree), not the staged state (btree_), this is important,
-    // we can't trust btree_ after a failed commit
 
     // assume we keep any gcksumdelta, this will get fixed the first time
     // we commit anything
-    if (start_rid == -2) {
+    if (start_rid <= -2) {
         mdir_->gcksumdelta = mdir->gcksumdelta;
     }
 
@@ -8833,7 +8828,7 @@ compact:;
                 mdir_->r.blocks[0], mdir_->r.blocks[1]);
         #endif
 
-        // don't copy over gcksum if relocating
+        // don't copy over gstate if relocating
         lfs3_srid_t start_rid_ = start_rid;
         if (relocated) {
             start_rid_ = lfs3_smax(start_rid_, -1);
@@ -9018,7 +9013,7 @@ static int lfs3_mdir_commit_(lfs3_t *lfs3, lfs3_mdir_t *mdir,
     // attempt to commit/compact the mdir normally
     lfs3_mdir_t mdir_[2];
     lfs3_srid_t split_rid;
-    int err = lfs3_mdir_commit__(lfs3, &mdir_[0], mdir, -2, -1,
+    int err = lfs3_mdir_commit__(lfs3, &mdir_[0], mdir, -2, -2,
             &split_rid,
             mdir->mid, rattrs);
     if (err && err != LFS3_ERR_RANGE
@@ -9346,7 +9341,7 @@ static int lfs3_mdir_commit_(lfs3_t *lfs3, lfs3_mdir_t *mdir,
 
             // commit mrootchild
             lfs3_mdir_t mrootparent_;
-            err = lfs3_mdir_commit__(lfs3, &mrootparent_, &mrootparent, -2, -1,
+            err = lfs3_mdir_commit__(lfs3, &mrootparent_, &mrootparent, -2, -2,
                     NULL,
                     -1, LFS3_RATTRS(
                         LFS3_RATTR(2, LFS3_TAG_MROOT, 0, LFS3_FROM_MPTR),
@@ -9393,7 +9388,7 @@ static int lfs3_mdir_commit_(lfs3_t *lfs3, lfs3_mdir_t *mdir,
                 goto failed;
             }
 
-            err = lfs3_mdir_commit___(lfs3, &mrootanchor_, -2, -1,
+            err = lfs3_mdir_commit___(lfs3, &mrootanchor_, -2, -2,
                     -1, LFS3_RATTRS(
                         LFS3_RATTR(2, LFS3_TAG_MAGIC, 0, LFS3_FROM_BUF, 8),
                         LFS3_RATTR_ARG("littlefs"),