summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2023-01-06 22:46:13 -0700
committerLuke Shumaker <lukeshu@lukeshu.com>2023-01-07 12:05:15 -0700
commite35a840272b9cb780741aa4a9fd3ee64e78940f9 (patch)
tree5322baf019d47ea284d60649fd99daba7e49ef88
parent269fb87588f1c5319b4b13335a082d31f23d5a12 (diff)
fixup! rebuildnodes/btrees: Don't include .Items() in .PotentialItems()
-rw-r--r--lib/btrfsprogs/btrfsinspect/rebuildnodes/btrees/tree.go2
-rw-r--r--lib/textui/log.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/btrfsprogs/btrfsinspect/rebuildnodes/btrees/tree.go b/lib/btrfsprogs/btrfsinspect/rebuildnodes/btrees/tree.go
index c381274..66cb0fa 100644
--- a/lib/btrfsprogs/btrfsinspect/rebuildnodes/btrees/tree.go
+++ b/lib/btrfsprogs/btrfsinspect/rebuildnodes/btrees/tree.go
@@ -148,7 +148,7 @@ func (tree *RebuiltTree) Items(ctx context.Context) *containers.SortedMap[btrfsp
// Do not mutate the returned map; it is a pointer to the
// RebuiltTree's internal map!
func (tree *RebuiltTree) PotentialItems(ctx context.Context) *containers.SortedMap[btrfsprim.Key, keyio.ItemPtr] {
- ctx = dlog.WithField(ctx, "btrfsinspect.rebuild-nodes.rebuild.index-all-items", fmt.Sprintf("tree=%v", tree.ID))
+ ctx = dlog.WithField(ctx, "btrfsinspect.rebuild-nodes.rebuild.index-exc-items", fmt.Sprintf("tree=%v", tree.ID))
return tree.items(ctx, tree.forrest.excItems,
func(roots containers.Set[btrfsvol.LogicalAddr]) bool {
return !tree.Roots.HasAny(roots)
diff --git a/lib/textui/log.go b/lib/textui/log.go
index 110e1aa..f73b271 100644
--- a/lib/textui/log.go
+++ b/lib/textui/log.go
@@ -330,7 +330,7 @@ func fieldOrd(key string) int {
return -4
case "btrfsinspect.rebuild-nodes.rebuild.index-inc-items":
return -3
- case "btrfsinspect.rebuild-nodes.rebuild.index-all-items":
+ case "btrfsinspect.rebuild-nodes.rebuild.index-exc-items":
return -2
case "btrfsinspect.rebuild-nodes.rebuild.index-nodes":
return -1