diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2023-03-04 09:42:44 -0700 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2023-04-15 12:01:29 -0600 |
| commit | b302df6a761fda3ba1ba60c6866eb39dbb36527a (patch) | |
| tree | d144566198f604d91d83196788bca588d99e74db /cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go | |
| parent | c2c6fa42233cd3911b81bb9449329816f645cec5 (diff) | |
Clean-up made possible by btrfsutil.RebuiltForrest implementing btrfs.ReadableFS
- rebuildtrees: Use .ForrestLookup instead of .RebuiltTree where possible
- btrfsutil: noopRebuiltForrestCallbacks: Use only the generic
btrfstree.Forrest API
- btrfsutil: RebuiltForrest, RebuiltTree: Avoid unnecessarily
reaching into forrest.inner
- btrfsutil: RebuiltTree: Drop the .ReadItem() method; it duplicates
.TreeLookup without benefit.
Diffstat (limited to 'cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go')
| -rw-r--r-- | cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go b/cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go index 7e2e49f..77d56ae 100644 --- a/cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go +++ b/cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go @@ -159,7 +159,7 @@ func (o *rebuilder) processTreeQueue(ctx context.Context) error { } // This will call o.AddedItem as nescessary, which // inserts to o.addedItemQueue. - _, _ = o.rebuilt.RebuiltTree(ctx, o.curKey.TreeID) + _, _ = o.rebuilt.ForrestLookup(ctx, o.curKey.TreeID) } return nil @@ -415,7 +415,7 @@ func (o *rebuilder) processSettledItemQueue(ctx context.Context) error { ctx := dlog.WithField(ctx, "btrfs.inspect.rebuild-trees.rebuild.process.item", key) item := keyAndBody{ itemToVisit: key, - Body: discardErr(o.rebuilt.RebuiltTree(ctx, key.TreeID)).ReadItem(ctx, key.Key), + Body: discardErr(discardErr(o.rebuilt.RebuiltTree(ctx, key.TreeID)).TreeLookup(ctx, key.Key)).Body, } if key.TreeID == btrfsprim.EXTENT_TREE_OBJECTID && (key.ItemType == btrfsprim.EXTENT_ITEM_KEY || key.ItemType == btrfsprim.METADATA_ITEM_KEY) { |