diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2023-03-30 15:15:50 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2023-03-30 15:15:50 -0600 |
| commit | b983da08439f041e9b93fa61aa2db5704be60022 (patch) | |
| tree | 17e354a1ce3ffc89e930c0e9730b4b11f867e81a | |
| parent | e3f0e61282d0190b9744c69ce69dcaeea22e6a3e (diff) | |
btrfsutil: OldRebuiltForrest: Simplify
| -rw-r--r-- | lib/btrfsutil/old_rebuilt_forrest.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/btrfsutil/old_rebuilt_forrest.go b/lib/btrfsutil/old_rebuilt_forrest.go index 535aa94..e6a0399 100644 --- a/lib/btrfsutil/old_rebuilt_forrest.go +++ b/lib/btrfsutil/old_rebuilt_forrest.go @@ -246,7 +246,7 @@ func (tree oldRebuiltTree) addErrs(fn func(btrfsprim.Key, uint32) int, err error } func (bt *OldRebuiltForrest) readNode(ctx context.Context, nodeInfo nodeInfo) *btrfstree.Node { - node, err := bt.inner.AcquireNode(ctx, nodeInfo.LAddr, btrfstree.NodeExpectations{ + node, err := bt.AcquireNode(ctx, nodeInfo.LAddr, btrfstree.NodeExpectations{ LAddr: containers.OptionalValue(nodeInfo.LAddr), Level: containers.OptionalValue(nodeInfo.Level), Generation: containers.OptionalValue(nodeInfo.Generation), @@ -287,7 +287,7 @@ func (tree oldRebuiltTree) TreeSearch(ctx context.Context, searcher btrfstree.Tr } node := tree.forrest.readNode(ctx, indexItem.Value.Node) - defer tree.forrest.inner.ReleaseNode(node) + defer tree.forrest.ReleaseNode(node) item := node.BodyLeaf[indexItem.Value.Slot] item.Body = item.Body.CloneItem() @@ -307,12 +307,12 @@ func (tree oldRebuiltTree) TreeRange(ctx context.Context, handleFn func(btrfstre tree.Items.Range( func(rbnode *containers.RBNode[oldRebuiltTreeValue]) bool { if node == nil || node.Head.Addr != rbnode.Value.Node.LAddr { - tree.forrest.inner.ReleaseNode(node) + tree.forrest.ReleaseNode(node) node = tree.forrest.readNode(ctx, rbnode.Value.Node) } return handleFn(node.BodyLeaf[rbnode.Value.Slot]) }) - tree.forrest.inner.ReleaseNode(node) + tree.forrest.ReleaseNode(node) return tree.addErrs(func(btrfsprim.Key, uint32) int { return 0 }, nil) } @@ -328,12 +328,12 @@ func (tree oldRebuiltTree) TreeSubrange(ctx context.Context, min int, searcher b func(rbNode *containers.RBNode[oldRebuiltTreeValue]) bool { cnt++ if node == nil || node.Head.Addr != rbNode.Value.Node.LAddr { - tree.forrest.inner.ReleaseNode(node) + tree.forrest.ReleaseNode(node) node = tree.forrest.readNode(ctx, rbNode.Value.Node) } return handleFn(node.BodyLeaf[rbNode.Value.Slot]) }) - tree.forrest.inner.ReleaseNode(node) + tree.forrest.ReleaseNode(node) var err error if cnt < min { @@ -359,7 +359,7 @@ func (tree oldRebuiltTree) TreeWalk(ctx context.Context, cbs btrfstree.TreeWalkH } if node == nil || node.Head.Addr != indexItem.Value.Node.LAddr { - tree.forrest.inner.ReleaseNode(node) + tree.forrest.ReleaseNode(node) node = tree.forrest.readNode(ctx, indexItem.Value.Node) } item := node.BodyLeaf[indexItem.Value.Slot] @@ -390,7 +390,7 @@ func (tree oldRebuiltTree) TreeWalk(ctx context.Context, cbs btrfstree.TreeWalkH } return ctx.Err() == nil }) - tree.forrest.inner.ReleaseNode(node) + tree.forrest.ReleaseNode(node) } // TreeCheckOwner implements btrfstree.Tree. |