diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/btrfs-rec/inspect_lsfiles.go | 3 | ||||
| -rw-r--r-- | cmd/btrfs-rec/inspect_lstrees.go | 16 | ||||
| -rw-r--r-- | cmd/btrfs-rec/inspect_spewitems.go | 7 |
3 files changed, 15 insertions, 11 deletions
diff --git a/cmd/btrfs-rec/inspect_lsfiles.go b/cmd/btrfs-rec/inspect_lsfiles.go index 283ee2d..b0bb160 100644 --- a/cmd/btrfs-rec/inspect_lsfiles.go +++ b/cmd/btrfs-rec/inspect_lsfiles.go @@ -19,6 +19,7 @@ import ( "git.lukeshu.com/btrfs-progs-ng/lib/btrfs" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem" + "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsprim" "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsutil" "git.lukeshu.com/btrfs-progs-ng/lib/maps" ) @@ -42,7 +43,7 @@ func init() { out := bufio.NewWriter(os.Stdout) printSubvol(out, "", true, "/", &btrfs.Subvolume{ FS: btrfsutil.NewBrokenTrees(ctx, fs), - TreeID: btrfs.FS_TREE_OBJECTID, + TreeID: btrfsprim.FS_TREE_OBJECTID, }) out.Flush() diff --git a/cmd/btrfs-rec/inspect_lstrees.go b/cmd/btrfs-rec/inspect_lstrees.go index 43ae592..a0f4ff3 100644 --- a/cmd/btrfs-rec/inspect_lstrees.go +++ b/cmd/btrfs-rec/inspect_lstrees.go @@ -16,6 +16,8 @@ import ( "git.lukeshu.com/btrfs-progs-ng/lib/btrfs" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem" + "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsprim" + "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfstree" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol" "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect" "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsutil" @@ -64,7 +66,7 @@ func init() { } visitedNodes := make(map[btrfsvol.LogicalAddr]struct{}) btrfsutil.WalkAllTrees(cmd.Context(), fs, btrfsutil.WalkAllTreesHandler{ - PreTree: func(name string, treeID btrfs.ObjID) { + PreTree: func(name string, treeID btrfsprim.ObjID) { treeErrCnt = 0 treeItemCnt = make(map[btrfsitem.Type]int) fmt.Printf("tree id=%v name=%q\n", treeID, name) @@ -72,23 +74,23 @@ func init() { Err: func(_ *btrfsutil.WalkError) { treeErrCnt++ }, - TreeWalkHandler: btrfs.TreeWalkHandler{ - Node: func(_ btrfs.TreePath, ref *diskio.Ref[btrfsvol.LogicalAddr, btrfs.Node]) error { + TreeWalkHandler: btrfstree.TreeWalkHandler{ + Node: func(_ btrfstree.TreePath, ref *diskio.Ref[btrfsvol.LogicalAddr, btrfstree.Node]) error { visitedNodes[ref.Addr] = struct{}{} return nil }, - Item: func(_ btrfs.TreePath, item btrfs.Item) error { + Item: func(_ btrfstree.TreePath, item btrfstree.Item) error { typ := item.Key.ItemType treeItemCnt[typ] = treeItemCnt[typ] + 1 return nil }, - BadItem: func(_ btrfs.TreePath, item btrfs.Item) error { + BadItem: func(_ btrfstree.TreePath, item btrfstree.Item) error { typ := item.Key.ItemType treeItemCnt[typ] = treeItemCnt[typ] + 1 return nil }, }, - PostTree: func(_ string, _ btrfs.ObjID) { + PostTree: func(_ string, _ btrfsprim.ObjID) { flush() }, }) @@ -104,7 +106,7 @@ func init() { continue } visitedNodes[laddr] = struct{}{} - node, err := btrfs.ReadNode[btrfsvol.LogicalAddr](fs, *sb, laddr, btrfs.NodeExpectations{ + node, err := btrfstree.ReadNode[btrfsvol.LogicalAddr](fs, *sb, laddr, btrfstree.NodeExpectations{ LAddr: containers.Optional[btrfsvol.LogicalAddr]{OK: true, Val: laddr}, }) if err != nil { diff --git a/cmd/btrfs-rec/inspect_spewitems.go b/cmd/btrfs-rec/inspect_spewitems.go index f2a06ca..a4e8d69 100644 --- a/cmd/btrfs-rec/inspect_spewitems.go +++ b/cmd/btrfs-rec/inspect_spewitems.go @@ -14,6 +14,7 @@ import ( "github.com/spf13/cobra" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs" + "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfstree" "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsutil" ) @@ -34,14 +35,14 @@ func init() { Err: func(err *btrfsutil.WalkError) { dlog.Error(ctx, err) }, - TreeWalkHandler: btrfs.TreeWalkHandler{ - Item: func(path btrfs.TreePath, item btrfs.Item) error { + TreeWalkHandler: btrfstree.TreeWalkHandler{ + Item: func(path btrfstree.TreePath, item btrfstree.Item) error { fmt.Printf("%s = ", path) spew.Dump(item) os.Stdout.WriteString("\n") return nil }, - BadItem: func(path btrfs.TreePath, item btrfs.Item) error { + BadItem: func(path btrfstree.TreePath, item btrfstree.Item) error { fmt.Printf("%s = ", path) spew.Dump(item) os.Stdout.WriteString("\n") |