From 9317e6ec41ebafe1a6950a2996dcd8c4e35650fd Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 29 Mar 2023 17:13:00 -0600 Subject: btrfstree: TreeOperatorImpl: Don't have NodeSource be embedded --- lib/btrfs/btrfstree/btree_forrest.go | 4 ++-- lib/btrfs/btrfstree/btree_tree.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/btrfs/btrfstree/btree_forrest.go b/lib/btrfs/btrfstree/btree_forrest.go index 38a2721..b017888 100644 --- a/lib/btrfs/btrfstree/btree_forrest.go +++ b/lib/btrfs/btrfstree/btree_forrest.go @@ -83,11 +83,11 @@ func LookupTreeRoot(_ context.Context, fs TreeOperator, sb Superblock, treeID bt } type TreeOperatorImpl struct { - NodeSource + NodeSource NodeSource } func (fs TreeOperatorImpl) RawTree(ctx context.Context, treeID btrfsprim.ObjID) (*RawTree, error) { - sb, err := fs.Superblock() + sb, err := fs.NodeSource.Superblock() if err != nil { return nil, err } diff --git a/lib/btrfs/btrfstree/btree_tree.go b/lib/btrfs/btrfstree/btree_tree.go index a943803..89b4c52 100644 --- a/lib/btrfs/btrfstree/btree_tree.go +++ b/lib/btrfs/btrfstree/btree_tree.go @@ -42,7 +42,7 @@ func (tree *RawTree) walk(ctx context.Context, path Path, cbs TreeWalkHandler) { } // 001 - node, err := tree.Forrest.ReadNode(path) + node, err := tree.Forrest.NodeSource.ReadNode(path) defer node.Free() if ctx.Err() != nil { return -- cgit v1.2.3-2-g168b