From 811b5e2c0b9721641ef17630ba046f99721594c7 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 27 Aug 2022 19:03:53 -0600 Subject: Misc tidy up --- lib/btrfs/io3_btree.go | 3 --- lib/btrfsprogs/btrfsinspect/rebuildmappings/fuzzymatchsums.go | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/btrfs/io3_btree.go b/lib/btrfs/io3_btree.go index 2efef89..7404b6c 100644 --- a/lib/btrfs/io3_btree.go +++ b/lib/btrfs/io3_btree.go @@ -397,9 +397,6 @@ func (fs *FS) treeWalk(ctx context.Context, path TreePath, errHandle func(*TreeE if err := cbs.PostNode(path, node); err != nil { errHandle(&TreeError{Path: path, Err: err}) } - if ctx.Err() != nil { - return - } } } diff --git a/lib/btrfsprogs/btrfsinspect/rebuildmappings/fuzzymatchsums.go b/lib/btrfsprogs/btrfsinspect/rebuildmappings/fuzzymatchsums.go index d326299..fa2592e 100644 --- a/lib/btrfsprogs/btrfsinspect/rebuildmappings/fuzzymatchsums.go +++ b/lib/btrfsprogs/btrfsinspect/rebuildmappings/fuzzymatchsums.go @@ -42,9 +42,8 @@ func fuzzyMatchBlockGroupSums(ctx context.Context, physicalSums map[btrfsvol.DeviceID]btrfssum.SumRun[btrfsvol.PhysicalAddr], logicalSums btrfssum.SumRunWithGaps[btrfsvol.LogicalAddr], ) error { - regions := ListUnmappedPhysicalRegions(fs) - dlog.Info(ctx, "... Indexing physical regions...") // O(m) + regions := ListUnmappedPhysicalRegions(fs) physicalIndex := make(map[btrfssum.ShortSum][]btrfsvol.QualifiedPhysicalAddr) if err := WalkUnmappedPhysicalRegions(ctx, physicalSums, regions, func(devID btrfsvol.DeviceID, region btrfssum.SumRun[btrfsvol.PhysicalAddr]) error { return region.Walk(ctx, func(paddr btrfsvol.PhysicalAddr, sum btrfssum.ShortSum) error { -- cgit v1.2.3-2-g168b