Don't let TreeWalk bail early, add TreeID in to TreePath

3 files changed, 6 insertions, 7 deletions

diff --git a/cmd/btrfs-rec/inspect_dumptrees.go b/cmd/btrfs-rec/inspect_dumptrees.go
index 5ddff60..4abeaba 100644
--- a/cmd/btrfs-rec/inspect_dumptrees.go
+++ b/cmd/btrfs-rec/inspect_dumptrees.go
@@ -22,10 +22,11 @@ func init() {
 			Short: "A clone of `btrfs inspect-internal dump-tree`",
 			Args:  cliutil.WrapPositionalArgs(cobra.NoArgs),
 		},
-		RunE: func(fs *btrfs.FS, _ *cobra.Command, _ []string) error {
+		RunE: func(fs *btrfs.FS, cmd *cobra.Command, _ []string) error {
 			const version = "5.18.1"
 			fmt.Printf("btrfs-progs v%v\n", version)
-			return btrfsinspect.DumpTrees(os.Stdout, os.Stderr, fs)
+			btrfsinspect.DumpTrees(cmd.Context(), os.Stdout, fs)
+			return nil
 		},
 	})
 }
diff --git a/cmd/btrfs-rec/inspect_lstrees.go b/cmd/btrfs-rec/inspect_lstrees.go
index 976514f..e308b20 100644
--- a/cmd/btrfs-rec/inspect_lstrees.go
+++ b/cmd/btrfs-rec/inspect_lstrees.go
@@ -35,7 +35,7 @@ func init() {
 					treeItemCnt = make(map[btrfsitem.Type]int)
 					fmt.Printf("tree id=%v name=%q\n", treeID, name)
 				},
-				Err: func(_ error) {
+				Err: func(_ *btrfsutil.WalkError) {
 					treeErrCnt++
 				},
 				TreeWalkHandler: btrfs.TreeWalkHandler{
diff --git a/cmd/btrfs-rec/repair_clearbadnodes.go b/cmd/btrfs-rec/repair_clearbadnodes.go
index 58b8bd6..3ae0810 100644
--- a/cmd/btrfs-rec/repair_clearbadnodes.go
+++ b/cmd/btrfs-rec/repair_clearbadnodes.go
@@ -5,8 +5,6 @@
 package main
 
 import (
-	"os"
-
 	"github.com/datawire/ocibuild/pkg/cliutil"
 	"github.com/spf13/cobra"
 
@@ -21,8 +19,8 @@ func init() {
 			Short: "Overwrite corrupt nodes with empty nodes",
 			Args:  cliutil.WrapPositionalArgs(cobra.NoArgs),
 		},
-		RunE: func(fs *btrfs.FS, _ *cobra.Command, _ []string) error {
-			return btrfsrepair.ClearBadNodes(os.Stdout, os.Stderr, fs)
+		RunE: func(fs *btrfs.FS, cmd *cobra.Command, _ []string) error {
+			return btrfsrepair.ClearBadNodes(cmd.Context(), fs)
 		},
 	})
 }