tree-wide: Refer to item "slots" rather than "indexes"

4 files changed, 29 insertions, 29 deletions

diff --git a/lib/btrfsutil/old_rebuilt_forrest.go b/lib/btrfsutil/old_rebuilt_forrest.go
index 2386803..6014793 100644
--- a/lib/btrfsutil/old_rebuilt_forrest.go
+++ b/lib/btrfsutil/old_rebuilt_forrest.go
@@ -237,7 +237,7 @@ func (bt *OldRebuiltForrest) TreeSearch(treeID btrfsprim.ObjID, fn func(btrfspri
 		return btrfstree.Item{}, bt.addErrs(tree, fn, err)
 	}
 
-	item := node.Data.BodyLeaf[itemPath.Node(-1).FromItemIdx]
+	item := node.Data.BodyLeaf[itemPath.Node(-1).FromItemSlot]
 	item.Body = item.Body.CloneItem()
 
 	// Since we were only asked to return 1 item, it isn't
@@ -275,7 +275,7 @@ func (bt *OldRebuiltForrest) TreeSearchAll(treeID btrfsprim.ObjID, fn func(btrfs
 				return nil, bt.addErrs(tree, fn, err)
 			}
 		}
-		ret[i] = node.Data.BodyLeaf[itemPath.Node(-1).FromItemIdx]
+		ret[i] = node.Data.BodyLeaf[itemPath.Node(-1).FromItemSlot]
 		ret[i].Body = ret[i].Body.CloneItem()
 	}
 	btrfstree.FreeNodeRef(node)
@@ -315,7 +315,7 @@ func (bt *OldRebuiltForrest) TreeWalk(ctx context.Context, treeID btrfsprim.ObjI
 					return true
 				}
 			}
-			item := node.Data.BodyLeaf[itemPath.Node(-1).FromItemIdx]
+			item := node.Data.BodyLeaf[itemPath.Node(-1).FromItemSlot]
 			if err := cbs.Item(itemPath, item); err != nil {
 				errHandle(&btrfstree.TreeError{Path: itemPath, Err: err})
 			}
diff --git a/lib/btrfsutil/rebuilt_readitem.go b/lib/btrfsutil/rebuilt_readitem.go
index a508d99..016299c 100644
--- a/lib/btrfsutil/rebuilt_readitem.go
+++ b/lib/btrfsutil/rebuilt_readitem.go
@@ -22,11 +22,11 @@ import (
 
 type ItemPtr struct {
 	Node btrfsvol.LogicalAddr
-	Idx  int
+	Slot int
 }
 
 func (ptr ItemPtr) String() string {
-	return fmt.Sprintf("node@%v[%v]", ptr.Node, ptr.Idx)
+	return fmt.Sprintf("node@%v[%v]", ptr.Node, ptr.Slot)
 }
 
 type SizeAndErr struct {
@@ -74,7 +74,7 @@ func (o *KeyIO) InsertNode(nodeRef *diskio.Ref[btrfsvol.LogicalAddr, btrfstree.N
 	for i, item := range nodeRef.Data.BodyLeaf {
 		ptr := ItemPtr{
 			Node: nodeRef.Addr,
-			Idx:  i,
+			Slot: i,
 		}
 		switch itemBody := item.Body.(type) {
 		case *btrfsitem.Inode:
@@ -159,13 +159,13 @@ func (o *KeyIO) ReadItem(ctx context.Context, ptr ItemPtr) btrfsitem.Item {
 	if o.graph.Nodes[ptr.Node].Level != 0 {
 		panic(fmt.Errorf("should not happen: btrfsutil.KeyIO.ReadItem called for non-leaf node@%v", ptr.Node))
 	}
-	if ptr.Idx < 0 {
-		panic(fmt.Errorf("should not happen: btrfsutil.KeyIO.ReadItem called for negative item index: %v", ptr.Idx))
+	if ptr.Slot < 0 {
+		panic(fmt.Errorf("should not happen: btrfsutil.KeyIO.ReadItem called for negative item slot: %v", ptr.Slot))
 	}
 	items := o.readNode(ctx, ptr.Node).Data.BodyLeaf
-	if ptr.Idx >= len(items) {
-		panic(fmt.Errorf("should not happen: btrfsutil.KeyIO.ReadItem called for out-of-bounds item index: index=%v len=%v",
-			ptr.Idx, len(items)))
+	if ptr.Slot >= len(items) {
+		panic(fmt.Errorf("should not happen: btrfsutil.KeyIO.ReadItem called for out-of-bounds item slot: slot=%v len=%v",
+			ptr.Slot, len(items)))
 	}
-	return items[ptr.Idx].Body.CloneItem()
+	return items[ptr.Slot].Body.CloneItem()
 }
diff --git a/lib/btrfsutil/rebuilt_tree.go b/lib/btrfsutil/rebuilt_tree.go
index 1009204..9e23074 100644
--- a/lib/btrfsutil/rebuilt_tree.go
+++ b/lib/btrfsutil/rebuilt_tree.go
@@ -192,7 +192,7 @@ func (tree *RebuiltTree) items(ctx context.Context, cache containers.Map[btrfspr
 			for j, itemKey := range tree.forrest.graph.Nodes[leaf].Items {
 				newPtr := ItemPtr{
 					Node: leaf,
-					Idx:  j,
+					Slot: j,
 				}
 				if oldPtr, exists := index.Load(itemKey); !exists {
 					index.Store(itemKey, newPtr)
diff --git a/lib/btrfsutil/skinny_paths.go b/lib/btrfsutil/skinny_paths.go
index da86273..adf539b 100644
--- a/lib/btrfsutil/skinny_paths.go
+++ b/lib/btrfsutil/skinny_paths.go
@@ -39,8 +39,8 @@ func (a *SkinnyPathArena) init() {
 	}
 }
 
-func (a *SkinnyPathArena) getItem(parent btrfstree.TreePath, itemIdx int) (btrfstree.TreePathElem, error) {
-	if itemIdx < 0 {
+func (a *SkinnyPathArena) getItem(parent btrfstree.TreePath, itemSlot int) (btrfstree.TreePathElem, error) {
+	if itemSlot < 0 {
 		panic("should not happen")
 	}
 
@@ -48,7 +48,7 @@ func (a *SkinnyPathArena) getItem(parent btrfstree.TreePath, itemIdx int) (btrfs
 
 	ret, ok := a.fatItems.Load(skinnyItem{
 		Node: parent.Node(-1).ToNodeAddr,
-		Item: itemIdx,
+		Item: itemSlot,
 	})
 	if ok {
 		return ret, nil
@@ -60,7 +60,7 @@ 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.BodyInterior) {
+		if itemSlot >= len(node.Data.BodyInterior) {
 			panic("should not happen")
 		}
 		for i, item := range node.Data.BodyInterior {
@@ -70,7 +70,7 @@ func (a *SkinnyPathArena) getItem(parent btrfstree.TreePath, itemIdx int) (btrfs
 			}
 			elem := btrfstree.TreePathElem{
 				FromTree:         node.Data.Head.Owner,
-				FromItemIdx:      i,
+				FromItemSlot:     i,
 				ToNodeAddr:       item.BlockPtr,
 				ToNodeGeneration: item.Generation,
 				ToNodeLevel:      node.Data.Head.Level - 1,
@@ -78,23 +78,23 @@ func (a *SkinnyPathArena) getItem(parent btrfstree.TreePath, itemIdx int) (btrfs
 				ToMaxKey:         toMaxKey,
 			}
 			a.fatItems.Store(skinnyItem{Node: parent.Node(-1).ToNodeAddr, Item: i}, elem)
-			if i == itemIdx {
+			if i == itemSlot {
 				ret = elem
 			}
 		}
 	} else {
-		if itemIdx >= len(node.Data.BodyLeaf) {
+		if itemSlot >= len(node.Data.BodyLeaf) {
 			panic("should not happen")
 		}
 		for i, item := range node.Data.BodyLeaf {
 			elem := btrfstree.TreePathElem{
-				FromTree:    node.Data.Head.Owner,
-				FromItemIdx: i,
-				ToKey:       item.Key,
-				ToMaxKey:    item.Key,
+				FromTree:     node.Data.Head.Owner,
+				FromItemSlot: i,
+				ToKey:        item.Key,
+				ToMaxKey:     item.Key,
 			}
 			a.fatItems.Store(skinnyItem{Node: parent.Node(-1).ToNodeAddr, Item: i}, elem)
-			if i == itemIdx {
+			if i == itemSlot {
 				ret = elem
 			}
 		}
@@ -114,8 +114,8 @@ func (a *SkinnyPathArena) Deflate(fat btrfstree.TreePath) SkinnyPath {
 			a.fatRoots[elem.ToNodeAddr] = elem
 			ret.Root = elem.ToNodeAddr
 		} else {
-			a.fatItems.Store(skinnyItem{Node: prevNode, Item: elem.FromItemIdx}, elem)
-			ret.Items = append(ret.Items, elem.FromItemIdx)
+			a.fatItems.Store(skinnyItem{Node: prevNode, Item: elem.FromItemSlot}, elem)
+			ret.Items = append(ret.Items, elem.FromItemSlot)
 		}
 		prevNode = elem.ToNodeAddr
 	}
@@ -134,8 +134,8 @@ func (a *SkinnyPathArena) Inflate(skinny SkinnyPath) btrfstree.TreePath {
 	}
 	ret = append(ret, root)
 
-	for _, itemIdx := range skinny.Items {
-		elem, err := a.getItem(ret, itemIdx)
+	for _, itemSlot := range skinny.Items {
+		elem, err := a.getItem(ret, itemSlot)
 		if err != nil {
 			panic(err)
 		}