From acd2813582fb2e463780149eebe655d5070f204b Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Tue, 4 Apr 2023 10:46:02 -0600
Subject: btrfsutil: OldRebuiltTree: Include the node address in errors

---
 lib/btrfsutil/old_rebuilt_forrest.go | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'lib/btrfsutil/old_rebuilt_forrest.go')

diff --git a/lib/btrfsutil/old_rebuilt_forrest.go b/lib/btrfsutil/old_rebuilt_forrest.go
index 9035b98..c451fb8 100644
--- a/lib/btrfsutil/old_rebuilt_forrest.go
+++ b/lib/btrfsutil/old_rebuilt_forrest.go
@@ -35,13 +35,14 @@ type oldRebuiltTree struct {
 var _ btrfstree.Tree = oldRebuiltTree{}
 
 type oldRebuiltTreeError struct {
-	Min btrfsprim.Key
-	Max btrfsprim.Key
-	Err error
+	Min  btrfsprim.Key
+	Max  btrfsprim.Key
+	Node btrfsvol.LogicalAddr
+	Err  error
 }
 
 func (e oldRebuiltTreeError) Error() string {
-	return fmt.Sprintf("keys %v-%v: %v", e.Min, e.Max, e.Err)
+	return fmt.Sprintf("keys %v-%v: node@%v: %v", e.Min, e.Max, e.Node, e.Err)
 }
 
 func (e oldRebuiltTreeError) Unwrap() error {
@@ -189,11 +190,12 @@ func (bt *OldRebuiltForrest) rawTreeWalk(ctx context.Context, treeID btrfsprim.O
 	var curNode nodeInfo
 	cbs := btrfstree.TreeWalkHandler{
 		BadNode: func(path btrfstree.Path, node *btrfstree.Node, err error) bool {
-			_, nodeExp, _ := path.NodeExpectations(ctx, false)
+			nodeAddr, nodeExp, _ := path.NodeExpectations(ctx, false)
 			cacheEntry.Errors.Insert(oldRebuiltTreeError{
-				Min: nodeExp.MinItem.Val,
-				Max: nodeExp.MaxItem.Val,
-				Err: err,
+				Min:  nodeExp.MinItem.Val,
+				Max:  nodeExp.MaxItem.Val,
+				Node: nodeAddr,
+				Err:  err,
 			})
 			return false
 		},
-- 
cgit v1.2.3-2-g168b