Merge branch 'lukeshu/api-cleanup'

1 files changed, 6 insertions, 7 deletions

diff --git a/cmd/btrfs-rec/inspect_lstrees.go b/cmd/btrfs-rec/inspect_lstrees.go
index 05c3a57..cad1a37 100644
--- a/cmd/btrfs-rec/inspect_lstrees.go
+++ b/cmd/btrfs-rec/inspect_lstrees.go
@@ -19,7 +19,6 @@ import (
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsutil"
 	"git.lukeshu.com/btrfs-progs-ng/lib/containers"
-	"git.lukeshu.com/btrfs-progs-ng/lib/diskio"
 	"git.lukeshu.com/btrfs-progs-ng/lib/maps"
 	"git.lukeshu.com/btrfs-progs-ng/lib/slices"
 	"git.lukeshu.com/btrfs-progs-ng/lib/textui"
@@ -76,16 +75,16 @@ func init() {
 					treeErrCnt++
 				},
 				TreeWalkHandler: btrfstree.TreeWalkHandler{
-					Node: func(_ btrfstree.TreePath, ref *diskio.Ref[btrfsvol.LogicalAddr, btrfstree.Node]) error {
-						visitedNodes.Insert(ref.Addr)
+					Node: func(path btrfstree.Path, node *btrfstree.Node) error {
+						visitedNodes.Insert(path.Node(-1).ToNodeAddr)
 						return nil
 					},
-					Item: func(_ btrfstree.TreePath, item btrfstree.Item) error {
+					Item: func(_ btrfstree.Path, item btrfstree.Item) error {
 						typ := item.Key.ItemType
 						treeItemCnt[typ]++
 						return nil
 					},
-					BadItem: func(_ btrfstree.TreePath, item btrfstree.Item) error {
+					BadItem: func(_ btrfstree.Path, item btrfstree.Item) error {
 						typ := item.Key.ItemType
 						treeItemCnt[typ]++
 						return nil
@@ -107,13 +106,13 @@ func init() {
 					}
 					visitedNodes.Insert(laddr)
 					node, err := btrfstree.ReadNode[btrfsvol.LogicalAddr](fs, *sb, laddr, btrfstree.NodeExpectations{
-						LAddr: containers.Optional[btrfsvol.LogicalAddr]{OK: true, Val: laddr},
+						LAddr: containers.OptionalValue(laddr),
 					})
 					if err != nil {
 						treeErrCnt++
 						continue
 					}
-					for _, item := range node.Data.BodyLeaf {
+					for _, item := range node.BodyLeaf {
 						typ := item.Key.ItemType
 						treeItemCnt[typ]++
 					}