diff options
Diffstat (limited to 'pkg/btrfsmisc')
| -rw-r--r-- | pkg/btrfsmisc/print_tree.go | 8 | ||||
| -rw-r--r-- | pkg/btrfsmisc/walk.go | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/pkg/btrfsmisc/print_tree.go b/pkg/btrfsmisc/print_tree.go index c11a294..3f1dd46 100644 --- a/pkg/btrfsmisc/print_tree.go +++ b/pkg/btrfsmisc/print_tree.go @@ -14,8 +14,8 @@ import ( // kernel-shared/print-tree.c:btrfs_print_tree() and // kernel-shared/print-tree.c:btrfs_print_leaf() func PrintTree(fs *btrfs.FS, root btrfs.LogicalAddr) error { - return fs.WalkTree(root, btrfs.WalkTreeHandler{ - Node: func(path btrfs.WalkTreePath, nodeRef *util.Ref[btrfs.LogicalAddr, btrfs.Node], err error) error { + return fs.TreeWalk(root, btrfs.TreeWalkHandler{ + Node: func(path btrfs.TreeWalkPath, nodeRef *util.Ref[btrfs.LogicalAddr, btrfs.Node], err error) error { if err != nil { fmt.Fprintf(os.Stderr, "error: %v: %v\n", path, err) } @@ -24,14 +24,14 @@ func PrintTree(fs *btrfs.FS, root btrfs.LogicalAddr) error { } return nil }, - PreKeyPointer: func(_ btrfs.WalkTreePath, item btrfs.KeyPointer) error { + PreKeyPointer: func(_ btrfs.TreeWalkPath, item btrfs.KeyPointer) error { fmt.Printf("\t%v block %v gen %v\n", FmtKey(item.Key), item.BlockPtr, item.Generation) return nil }, - Item: func(path btrfs.WalkTreePath, item btrfs.Item) error { + Item: func(path btrfs.TreeWalkPath, item btrfs.Item) error { i := path[len(path)-1].ItemIdx fmt.Printf("\titem %v %v itemoff %v itemsize %v\n", i, diff --git a/pkg/btrfsmisc/walk.go b/pkg/btrfsmisc/walk.go index a82bd5f..545afb9 100644 --- a/pkg/btrfsmisc/walk.go +++ b/pkg/btrfsmisc/walk.go @@ -10,7 +10,7 @@ import ( type WalkErr struct { TreeName string - Path btrfs.WalkTreePath + Path btrfs.TreeWalkPath Err error } @@ -29,7 +29,7 @@ type WalkFSHandler struct { PreTree func(name string, laddr btrfs.LogicalAddr) PostTree func(name string, laddr btrfs.LogicalAddr) // Callbacks for nodes or smaller - btrfs.WalkTreeHandler + btrfs.TreeWalkHandler } // WalkFS walks all trees in a *btrfs.FS. Rather than returning an @@ -37,7 +37,7 @@ type WalkFSHandler struct { // will always be of type WalkErr. func WalkFS(fs *btrfs.FS, cbs WalkFSHandler) { var treeName string - handleErr := func(path btrfs.WalkTreePath, err error) { + handleErr := func(path btrfs.TreeWalkPath, err error) { cbs.Err(WalkErr{ TreeName: treeName, Path: path, @@ -50,7 +50,7 @@ func WalkFS(fs *btrfs.FS, cbs WalkFSHandler) { Root btrfs.LogicalAddr } origItem := cbs.Item - cbs.Item = func(path btrfs.WalkTreePath, item btrfs.Item) error { + cbs.Item = func(path btrfs.TreeWalkPath, item btrfs.Item) error { if item.Head.Key.ItemType == btrfsitem.ROOT_ITEM_KEY { root, ok := item.Body.(btrfsitem.Root) if !ok { @@ -73,7 +73,7 @@ func WalkFS(fs *btrfs.FS, cbs WalkFSHandler) { } origNode := cbs.Node - cbs.Node = func(path btrfs.WalkTreePath, node *util.Ref[btrfs.LogicalAddr, btrfs.Node], err error) error { + cbs.Node = func(path btrfs.TreeWalkPath, node *util.Ref[btrfs.LogicalAddr, btrfs.Node], err error) error { if err != nil { handleErr(path, err) } @@ -92,28 +92,28 @@ func WalkFS(fs *btrfs.FS, cbs WalkFSHandler) { treeName = "root tree" cbs.PreTree(treeName, superblock.Data.RootTree) - if err := fs.WalkTree(superblock.Data.RootTree, cbs.WalkTreeHandler); err != nil { + if err := fs.TreeWalk(superblock.Data.RootTree, cbs.TreeWalkHandler); err != nil { handleErr(nil, err) } cbs.PostTree(treeName, superblock.Data.RootTree) treeName = "chunk tree" cbs.PreTree(treeName, superblock.Data.ChunkTree) - if err := fs.WalkTree(superblock.Data.ChunkTree, cbs.WalkTreeHandler); err != nil { + if err := fs.TreeWalk(superblock.Data.ChunkTree, cbs.TreeWalkHandler); err != nil { handleErr(nil, err) } cbs.PostTree(treeName, superblock.Data.ChunkTree) treeName = "log tree" cbs.PreTree(treeName, superblock.Data.LogTree) - if err := fs.WalkTree(superblock.Data.LogTree, cbs.WalkTreeHandler); err != nil { + if err := fs.TreeWalk(superblock.Data.LogTree, cbs.TreeWalkHandler); err != nil { handleErr(nil, err) } cbs.PostTree(treeName, superblock.Data.LogTree) treeName = "block group tree" cbs.PreTree(treeName, superblock.Data.BlockGroupRoot) - if err := fs.WalkTree(superblock.Data.BlockGroupRoot, cbs.WalkTreeHandler); err != nil { + if err := fs.TreeWalk(superblock.Data.BlockGroupRoot, cbs.TreeWalkHandler); err != nil { handleErr(nil, err) } cbs.PostTree(treeName, superblock.Data.BlockGroupRoot) @@ -121,7 +121,7 @@ func WalkFS(fs *btrfs.FS, cbs WalkFSHandler) { for _, tree := range foundTrees { treeName = tree.Name cbs.PreTree(treeName, tree.Root) - if err := fs.WalkTree(tree.Root, cbs.WalkTreeHandler); err != nil { + if err := fs.TreeWalk(tree.Root, cbs.TreeWalkHandler); err != nil { handleErr(nil, err) } cbs.PostTree(treeName, tree.Root) |