From d8d6052d90e3d74c3f83dbc99dd8da82ba3a6cc6 Mon Sep 17 00:00:00 2001
From: Christopher Haster <geky@geky.net>
Date: Mon, 26 Feb 2024 01:33:42 -0600
Subject: [PATCH] Dropped -m/--mleaf-weight from dbg scripts

Now that we're assuming a perfect compaction algorithm, and an
infinitely compatible mleaf-bits, there really shouldn't be any reason
to support non-standard mleaf-bits in our scripts, right?

If a configurable mleaf-bits becomes necessary, we can always add this
back in the future.
---
 scripts/dbgbmap.py  | 12 ------------
 scripts/dbglfs.py   |  9 +--------
 scripts/dbgmtree.py |  9 +--------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/scripts/dbgbmap.py b/scripts/dbgbmap.py
index 5cf465d0..feefc38a 100755
--- a/scripts/dbgbmap.py
+++ b/scripts/dbgbmap.py
@@ -1179,7 +1179,6 @@ class Rbyd:
 def main(disk, mroots=None, *,
         block_size=None,
         block_count=None,
-        mleaf_weight=None,
         block=None,
         off=None,
         size=None,
@@ -1340,12 +1339,6 @@ def main(disk, mroots=None, *,
                 block_size=block_size,
                 block_count=block_count)
 
-
-        # determine the mleaf_weight from the block_size, this is just for
-        # printing purposes
-        if mleaf_weight is None:
-            mleaf_weight = 1 << m.ceil(m.log2(block_size // 8))
-
         #### traverse the filesystem
 
         # fetch the mroot chain
@@ -1637,11 +1630,6 @@ if __name__ == "__main__":
         '--block-count',
         type=lambda x: int(x, 0),
         help="Block count in blocks.")
-    parser.add_argument(
-        '-m', '--mleaf-weight',
-        type=lambda x: int(x, 0),
-        help="Maximum weight of mdirs for mid decoding. Defaults to a "
-            "block_size derived value.")
     parser.add_argument(
         '-@', '--block',
         nargs='?',
diff --git a/scripts/dbglfs.py b/scripts/dbglfs.py
index 39ad1042..7e644732 100755
--- a/scripts/dbglfs.py
+++ b/scripts/dbglfs.py
@@ -1655,7 +1655,6 @@ def dbg_fstruct(f, block_size, mdir, rid, tag, j, d, data, *,
 def main(disk, mroots=None, *,
         block_size=None,
         block_count=None,
-        mleaf_weight=None,
         color='auto',
         **args):
     # figure out what color should be
@@ -1686,8 +1685,7 @@ def main(disk, mroots=None, *,
 
         # determine the mleaf_weight from the block_size, this is just for
         # printing purposes
-        if mleaf_weight is None:
-            mleaf_weight = 1 << m.ceil(m.log2(block_size // 8))
+        mleaf_weight = 1 << m.ceil(m.log2(block_size // 8))
 
         # before we print, we need to do a pass for a few things:
         # - find the actual mroot
@@ -2184,11 +2182,6 @@ if __name__ == "__main__":
         '--block-count',
         type=lambda x: int(x, 0),
         help="Block count in blocks.")
-    parser.add_argument(
-        '-m', '--mleaf-weight',
-        type=lambda x: int(x, 0),
-        help="Maximum weight of mdirs for mid decoding. Defaults to a "
-            "block_size derived value.")
     parser.add_argument(
         '--color',
         choices=['never', 'always', 'auto'],
diff --git a/scripts/dbgmtree.py b/scripts/dbgmtree.py
index e8ab8ad4..378f0754 100755
--- a/scripts/dbgmtree.py
+++ b/scripts/dbgmtree.py
@@ -812,7 +812,6 @@ class Rbyd:
 def main(disk, mroots=None, *,
         block_size=None,
         block_count=None,
-        mleaf_weight=None,
         color='auto',
         **args):
     # figure out what color should be
@@ -843,8 +842,7 @@ def main(disk, mroots=None, *,
 
         # determine the mleaf_weight from the block_size, this is just for
         # printing purposes
-        if mleaf_weight is None:
-            mleaf_weight = 1 << m.ceil(m.log2(block_size // 8))
+        mleaf_weight = 1 << m.ceil(m.log2(block_size // 8))
 
         # before we print, we need to do a pass for a few things:
         # - find the actual mroot
@@ -1671,11 +1669,6 @@ if __name__ == "__main__":
         '--block-count',
         type=lambda x: int(x, 0),
         help="Block count in blocks.")
-    parser.add_argument(
-        '-m', '--mleaf-weight',
-        type=lambda x: int(x, 0),
-        help="Maximum weight of mdirs for mid decoding. Defaults to a "
-            "block_size derived value.")
     parser.add_argument(
         '--color',
         choices=['never', 'always', 'auto'],