From 7349ff1a01b29eae7f7e769fe44548f09c253d2b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 2 Mar 2023 17:25:49 -0700 Subject: tree-wide: Have "interior" rather than "internal" be the antonym of "leaf" Because "internal" has a meaning in the Go world, and it's confusing. --- lib/btrfsutil/graph.go | 4 ++-- lib/btrfsutil/skinny_paths.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/btrfsutil') diff --git a/lib/btrfsutil/graph.go b/lib/btrfsutil/graph.go index 9e453eb..09a17b4 100644 --- a/lib/btrfsutil/graph.go +++ b/lib/btrfsutil/graph.go @@ -183,8 +183,8 @@ func (g Graph) InsertNode(nodeRef *diskio.Ref[btrfsvol.LogicalAddr, btrfstree.No } } else { g.Nodes[nodeRef.Addr] = nodeData - kps := make([]GraphEdge, len(nodeRef.Data.BodyInternal)) - for i, kp := range nodeRef.Data.BodyInternal { + kps := make([]GraphEdge, len(nodeRef.Data.BodyInterior)) + for i, kp := range nodeRef.Data.BodyInterior { kps[i] = GraphEdge{ FromNode: nodeRef.Addr, FromItem: i, diff --git a/lib/btrfsutil/skinny_paths.go b/lib/btrfsutil/skinny_paths.go index 1695990..da86273 100644 --- a/lib/btrfsutil/skinny_paths.go +++ b/lib/btrfsutil/skinny_paths.go @@ -60,13 +60,13 @@ func (a *SkinnyPathArena) getItem(parent btrfstree.TreePath, itemIdx int) (btrfs return btrfstree.TreePathElem{}, err } if node.Data.Head.Level > 0 { - if itemIdx >= len(node.Data.BodyInternal) { + if itemIdx >= len(node.Data.BodyInterior) { panic("should not happen") } - for i, item := range node.Data.BodyInternal { + for i, item := range node.Data.BodyInterior { toMaxKey := parent.Node(-1).ToMaxKey - if i+1 < len(node.Data.BodyInternal) { - toMaxKey = node.Data.BodyInternal[i+1].Key.Mm() + if i+1 < len(node.Data.BodyInterior) { + toMaxKey = node.Data.BodyInterior[i+1].Key.Mm() } elem := btrfstree.TreePathElem{ FromTree: node.Data.Head.Owner, -- cgit v1.2.3-2-g168b