From 4278c185aafb0fb197e52cdb9eb9bd9d36b61c4d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Tue, 7 Mar 2023 01:35:08 -0700
Subject: cmd/btrfs-rec: Smash scandevices and rebuild-mappings together

---
 scripts/main.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/main.sh b/scripts/main.sh
index 4aa96ea..67fb330 100755
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -32,9 +32,9 @@ export GOMEMLIMIT="$(awk '/^MemTotal:/{ print $2 "KiB" }' </proc/meminfo)"
 ######################################################################
 
 run-btrfs-rec $gendir/0.scandevices.json \
-    inspect scandevices
+    inspect rebuild-mappings scan
 run-btrfs-rec $gendir/1.mappings.json \
-    inspect rebuild-mappings $gendir/0.scandevices.json
+    inspect rebuild-mappings process $gendir/0.scandevices.json
 
 # 1.mappings.log says:
 #
@@ -52,13 +52,13 @@ run-btrfs-rec $gendir/1.mappings.json \
 # matter which order we put the 2 block groups in within that physical
 # region.  So just put them in laddr order.
 #
-# And then run that through `rebuild-mappings` again to fill in the
+# And then run that through `rebuild-mappings process` again to fill in the
 # flags and normalize it.
 run-btrfs-rec $gendir/2.mappings.json \
     --mappings=<(sed <$gendir/1.mappings.json \
       -e '2a{"LAddr":5242880,"PAddr":{"Dev":1,"Addr":5242880},"Size":1},' \
       -e '2a{"LAddr":13631488,"PAddr":{"Dev":1,"Addr":13631488},"Size":1},') \
-    inspect rebuild-mappings $gendir/0.scandevices.json
+    inspect rebuild-mappings process $gendir/0.scandevices.json
 
 run-btrfs-rec $gendir/3.nodes.json \
     --mappings=$gendir/2.mappings.json \
-- 
cgit v1.2.3-2-g168b


From d8f9c4d091f6c2554251941c933e4549502d2e84 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Tue, 7 Mar 2023 12:47:24 -0700
Subject: =?UTF-8?q?cmd/btrs-rec:=20Rename=20'inspect=20rebuild-nodes'?=
 =?UTF-8?q?=E2=86=92'inspect=20rebuild-trees'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/main.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/main.sh b/scripts/main.sh
index 67fb330..2ea5213 100755
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -60,9 +60,9 @@ run-btrfs-rec $gendir/2.mappings.json \
       -e '2a{"LAddr":13631488,"PAddr":{"Dev":1,"Addr":13631488},"Size":1},') \
     inspect rebuild-mappings process $gendir/0.scandevices.json
 
-run-btrfs-rec $gendir/3.nodes.json \
+run-btrfs-rec $gendir/3.trees.json \
     --mappings=$gendir/2.mappings.json \
-    inspect rebuild-nodes $gendir/0.scandevices.json
+    inspect rebuild-trees $gendir/0.scandevices.json
 
 run-btrfs-rec $gendir/4.ls-files.txt \
     --mappings=$gendir/2.mappings.json \
-- 
cgit v1.2.3-2-g168b


From 3949bd3ff240bc6d06dd08f6e3183e72571e0e1d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Tue, 7 Mar 2023 12:10:42 -0700
Subject: Expose node-lists as a thing on the CLI

---
 scripts/main.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/main.sh b/scripts/main.sh
index 2ea5213..dddb9bb 100755
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -33,6 +33,8 @@ export GOMEMLIMIT="$(awk '/^MemTotal:/{ print $2 "KiB" }' </proc/meminfo)"
 
 run-btrfs-rec $gendir/0.scandevices.json \
     inspect rebuild-mappings scan
+run-btrfs-rec $gendir/0.nodes.json \
+    inspect rebuild-mappings list-nodes $gendir/0.scandevices.json
 run-btrfs-rec $gendir/1.mappings.json \
     inspect rebuild-mappings process $gendir/0.scandevices.json
 
@@ -62,11 +64,11 @@ run-btrfs-rec $gendir/2.mappings.json \
 
 run-btrfs-rec $gendir/3.trees.json \
     --mappings=$gendir/2.mappings.json \
-    inspect rebuild-trees $gendir/0.scandevices.json
+    inspect rebuild-trees --node-list=$gendir/0.nodes.json
 
 run-btrfs-rec $gendir/4.ls-files.txt \
     --mappings=$gendir/2.mappings.json \
     inspect ls-files
 run-btrfs-rec $gendir/4.ls-trees.txt \
     --mappings=$gendir/2.mappings.json \
-    inspect ls-trees --scandevices=$gendir/0.scandevices.json
+    inspect ls-trees --node-list=$gendir/0.nodes.json
-- 
cgit v1.2.3-2-g168b