diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2023-04-05 07:49:02 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2023-04-05 07:49:02 -0600 |
| commit | 68eb7a16b9759646619a7d9dec2b62fa9d0c30cf (patch) | |
| tree | 8bb4b70337a299f1dacb3c2858210d4bf6bd4b04 /lib/btrfsutil/old_rebuilt_forrest.go | |
| parent | b0f290078d531d2dcb5d34e809b0711ce9b6491e (diff) | |
| parent | d7dd6dfd7aeb40f06ff4fbe7f906d8feed64b95f (diff) | |
Merge branch 'lukeshu/misc'
Diffstat (limited to 'lib/btrfsutil/old_rebuilt_forrest.go')
| -rw-r--r-- | lib/btrfsutil/old_rebuilt_forrest.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/btrfsutil/old_rebuilt_forrest.go b/lib/btrfsutil/old_rebuilt_forrest.go index c451fb8..0a3106d 100644 --- a/lib/btrfsutil/old_rebuilt_forrest.go +++ b/lib/btrfsutil/old_rebuilt_forrest.go @@ -53,11 +53,11 @@ type oldRebuiltTreeValue struct { Key btrfsprim.Key ItemSize uint32 - Node nodeInfo + Node oldRebuiltNodeInfo Slot int } -type nodeInfo struct { +type oldRebuiltNodeInfo struct { LAddr btrfsvol.LogicalAddr Level uint8 Generation btrfsprim.Generation @@ -187,7 +187,7 @@ func (bt *OldRebuiltForrest) rawTreeWalk(ctx context.Context, treeID btrfsprim.O cacheEntry.ParentUUID = root.ParentUUID cacheEntry.ParentGen = root.ParentGen - var curNode nodeInfo + var curNode oldRebuiltNodeInfo cbs := btrfstree.TreeWalkHandler{ BadNode: func(path btrfstree.Path, node *btrfstree.Node, err error) bool { nodeAddr, nodeExp, _ := path.NodeExpectations(ctx, false) @@ -200,7 +200,7 @@ func (bt *OldRebuiltForrest) rawTreeWalk(ctx context.Context, treeID btrfsprim.O return false }, Node: func(path btrfstree.Path, node *btrfstree.Node) { - curNode = nodeInfo{ + curNode = oldRebuiltNodeInfo{ LAddr: node.Head.Addr, Level: node.Head.Level, Generation: node.Head.Generation, @@ -247,7 +247,7 @@ func (tree oldRebuiltTree) addErrs(fn func(btrfsprim.Key, uint32) int, err error return errs } -func (bt *OldRebuiltForrest) readNode(ctx context.Context, nodeInfo nodeInfo) *btrfstree.Node { +func (bt *OldRebuiltForrest) readNode(ctx context.Context, nodeInfo oldRebuiltNodeInfo) *btrfstree.Node { node, err := bt.AcquireNode(ctx, nodeInfo.LAddr, btrfstree.NodeExpectations{ LAddr: containers.OptionalValue(nodeInfo.LAddr), Level: containers.OptionalValue(nodeInfo.Level), |