From ff1cf2e06a30a096c5b7f9b0643a329250689bd1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 13 Jul 2022 00:58:35 -0600 Subject: Add a TreePath.Node(x) method to help clean up the code --- lib/btrfsprogs/btrfsinspect/print_tree.go | 2 +- lib/btrfsprogs/btrfsrepair/clearnodes.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/btrfsprogs') diff --git a/lib/btrfsprogs/btrfsinspect/print_tree.go b/lib/btrfsprogs/btrfsinspect/print_tree.go index 142f5e5..5d3b4ef 100644 --- a/lib/btrfsprogs/btrfsinspect/print_tree.go +++ b/lib/btrfsprogs/btrfsinspect/print_tree.go @@ -107,7 +107,7 @@ func printTree(ctx context.Context, out io.Writer, fs *btrfs.FS, treeID btrfs.Ob return nil }, Item: func(path btrfs.TreePath, item btrfs.Item) error { - i := path.Nodes[len(path.Nodes)-1].ItemIdx + i := path.Node(-1).ItemIdx bs, _ := binstruct.Marshal(item.Body) itemSize := uint32(len(bs)) itemOffset -= itemSize diff --git a/lib/btrfsprogs/btrfsrepair/clearnodes.go b/lib/btrfsprogs/btrfsrepair/clearnodes.go index b38a333..9fa5a6a 100644 --- a/lib/btrfsprogs/btrfsrepair/clearnodes.go +++ b/lib/btrfsprogs/btrfsrepair/clearnodes.go @@ -57,7 +57,7 @@ func ClearBadNodes(ctx context.Context, fs *btrfs.FS) error { Generation: 0, Owner: path.TreeID, NumItems: 0, - Level: path.Nodes[len(path.Nodes)-1].NodeLevel, + Level: path.Node(-1).NodeLevel, }, } node.Data.Head.Checksum, err = node.Data.CalculateChecksum() -- cgit v1.2.3-2-g168b