From 20de3140073547344d159a65db1a7e5c90ef95e9 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Fri, 31 Mar 2023 17:40:36 -0600
Subject: =?UTF-8?q?btrfsutil:=20Graph:=20I=20missed=20.FromItem=20in=20the?=
 =?UTF-8?q?=20"item"=E2=86=92"slot"=20switch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/btrfsutil/graph.go       | 14 +++++++-------
 lib/btrfsutil/graph_loops.go |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib/btrfsutil')

diff --git a/lib/btrfsutil/graph.go b/lib/btrfsutil/graph.go
index ea33be7..090ccf4 100644
--- a/lib/btrfsutil/graph.go
+++ b/lib/btrfsutil/graph.go
@@ -59,7 +59,7 @@ type GraphEdge struct {
 	// superblock.
 	FromRoot btrfsvol.LogicalAddr
 	FromNode btrfsvol.LogicalAddr
-	FromItem int // only valid if one of FromRoot or FromNode is non-zero
+	FromSlot int // only valid if one of FromRoot or FromNode is non-zero
 
 	FromTree btrfsprim.ObjID
 
@@ -74,10 +74,10 @@ func (kp GraphEdge) String() string {
 	switch {
 	case kp.FromRoot != 0:
 		from = fmt.Sprintf("root@%v[%d]:%v",
-			kp.FromRoot, kp.FromItem, kp.FromTree)
+			kp.FromRoot, kp.FromSlot, kp.FromTree)
 	case kp.FromNode != 0:
 		from = fmt.Sprintf("{node:%v, tree:%v}[%d]",
-			kp.FromNode, kp.FromTree, kp.FromItem)
+			kp.FromNode, kp.FromTree, kp.FromSlot)
 	default:
 		from = fmt.Sprintf("superblock:%v", kp.FromTree)
 	}
@@ -103,8 +103,8 @@ func (g Graph) insertEdge(ptr *GraphEdge) {
 	if ptr.FromRoot != 0 && ptr.FromNode != 0 {
 		panic("kp.FromRoot and kp.FromNode should not both be set")
 	}
-	if (ptr.FromRoot == 0 && ptr.FromNode == 0) && ptr.FromItem != 0 {
-		panic("kp.FromItem should only be set if either kp.FromRoot or kp.FromItem is set")
+	if (ptr.FromRoot == 0 && ptr.FromNode == 0) && ptr.FromSlot != 0 {
+		panic("kp.FromSlot should only be set if either kp.FromRoot or kp.FromSlot is set")
 	}
 	g.EdgesFrom[ptr.FromNode] = append(g.EdgesFrom[ptr.FromNode], ptr)
 	g.EdgesTo[ptr.ToNode] = append(g.EdgesTo[ptr.ToNode], ptr)
@@ -171,7 +171,7 @@ func (g Graph) InsertNode(node *btrfstree.Node) {
 			if itemBody, ok := item.Body.(*btrfsitem.Root); ok {
 				kps = append(kps, GraphEdge{
 					FromRoot:     node.Head.Addr,
-					FromItem:     i,
+					FromSlot:     i,
 					FromTree:     item.Key.ObjectID,
 					ToNode:       itemBody.ByteNr,
 					ToLevel:      itemBody.Level,
@@ -186,7 +186,7 @@ func (g Graph) InsertNode(node *btrfstree.Node) {
 		for i, kp := range node.BodyInterior {
 			kps[i] = GraphEdge{
 				FromNode:     node.Head.Addr,
-				FromItem:     i,
+				FromSlot:     i,
 				FromTree:     node.Head.Owner,
 				ToNode:       kp.BlockPtr,
 				ToLevel:      node.Head.Level - 1,
diff --git a/lib/btrfsutil/graph_loops.go b/lib/btrfsutil/graph_loops.go
index b5690af..d613481 100644
--- a/lib/btrfsutil/graph_loops.go
+++ b/lib/btrfsutil/graph_loops.go
@@ -43,7 +43,7 @@ func (g Graph) renderNode(node btrfsvol.LogicalAddr) []string {
 }
 
 func (g Graph) renderEdge(kp GraphEdge) []string {
-	a := fmt.Sprintf("[%d]={", kp.FromItem)
+	a := fmt.Sprintf("[%d]={", kp.FromSlot)
 	b := strings.Repeat(" ", len(a))
 	ret := []string{
 		a + fmt.Sprintf("ToNode:  %v,", kp.ToNode),
-- 
cgit v1.2.3-2-g168b