diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2023-01-25 16:53:33 -0700 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2023-01-25 16:53:33 -0700 |
| commit | 0134f07a4b97a455557277b2c89e0ee5ad6b2e62 (patch) | |
| tree | 5322baf019d47ea284d60649fd99daba7e49ef88 | |
| parent | cd01485ec126c103fa9ab718685d184b70d0e1ff (diff) | |
| parent | e35a840272b9cb780741aa4a9fd3ee64e78940f9 (diff) | |
Merge branch 'lukeshu/fixups'
| -rw-r--r-- | cmd/btrfs-rec/inspect_rebuildmappings.go | 2 | ||||
| -rw-r--r-- | lib/btrfsprogs/btrfsinspect/rebuildnodes/btrees/tree.go | 2 | ||||
| -rw-r--r-- | lib/textui/log.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/btrfs-rec/inspect_rebuildmappings.go b/cmd/btrfs-rec/inspect_rebuildmappings.go index 4503d44..e1f273c 100644 --- a/cmd/btrfs-rec/inspect_rebuildmappings.go +++ b/cmd/btrfs-rec/inspect_rebuildmappings.go @@ -47,7 +47,7 @@ func init() { } dlog.Infof(ctx, "Writing reconstructed mappings to stdout...") - if err := writeJSONFile(os.Stdout, fs, lowmemjson.ReEncoder{ + if err := writeJSONFile(os.Stdout, fs.LV.Mappings(), lowmemjson.ReEncoder{ Indent: "\t", ForceTrailingNewlines: true, CompactIfUnder: 120, //nolint:gomnd // This is what looks nice. 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 |