From 489eeb7da06700fdfadba337cb4ad6aa33b6f99b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 2 Apr 2023 09:32:48 -0600 Subject: btrfsutil: RebuiltTree: Update comments for the new cache interface --- lib/btrfsutil/rebuilt_tree.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/btrfsutil/rebuilt_tree.go') diff --git a/lib/btrfsutil/rebuilt_tree.go b/lib/btrfsutil/rebuilt_tree.go index e65a3f6..d25ffc3 100644 --- a/lib/btrfsutil/rebuilt_tree.go +++ b/lib/btrfsutil/rebuilt_tree.go @@ -33,13 +33,13 @@ type RebuiltTree struct { mu sync.RWMutex Roots containers.Set[btrfsvol.LogicalAddr] // There are 3 more mutable "members" that are protected by - // `mu`; but they live in a shared ARCache. They are all + // `mu`; but they live in a shared Cache. They are all // derived from tree.Roots, which is why it's OK if they get // evicted. // - // 1. tree.leafToRoots() = tree.forrest.leafs.Load(tree.ID) - // 2. tree.RebuiltItems() = tree.forrest.incItems.Load(tree.ID) - // 3. tree.RebuiltPotentialItems() = tree.forrest.excItems.Load(tree.ID) + // 1. tree.leafToRoots() = tree.forrest.leafs.Acquire(tree.ID) + // 2. tree.RebuiltItems() = tree.forrest.incItems.Acquire(tree.ID) + // 3. tree.RebuiltPotentialItems() = tree.forrest.excItems.Acquire(tree.ID) } // evictable member 1: .leafToRoots() ////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3-54-g00ecf From d39e73e41249f5daaf60069a9c77f5728d5d4398 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 3 Apr 2023 17:30:34 -0600 Subject: btrfsutil: RebuiltTree: Fix a comment --- lib/btrfsutil/rebuilt_tree.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/btrfsutil/rebuilt_tree.go') diff --git a/lib/btrfsutil/rebuilt_tree.go b/lib/btrfsutil/rebuilt_tree.go index d25ffc3..b996bdb 100644 --- a/lib/btrfsutil/rebuilt_tree.go +++ b/lib/btrfsutil/rebuilt_tree.go @@ -120,7 +120,7 @@ func (tree *RebuiltTree) indexNode(ctx context.Context, node btrfsvol.LogicalAdd } // isOwnerOK returns whether it is permissible for a node with -// .Head.Owner=owner to be in this tree. +// .Head.Owner=owner and .Head.Generation=gen to be in this tree. func (tree *RebuiltTree) isOwnerOK(owner btrfsprim.ObjID, gen btrfsprim.Generation) bool { for { if owner == tree.ID { -- cgit v1.2.3-54-g00ecf