diff options
author | Luke Shumaker <lukeshu@lukeshu.com> | 2022-08-17 21:49:54 -0600 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2022-08-17 22:50:24 -0600 |
commit | eb4e771e2a99edeb5cc3a1511ab611480f98255d (patch) | |
tree | cb024105ab30d0612b2fb47481158c04e095cb50 /lib/btrfsprogs | |
parent | 4047078908cc0732642f5807636f37b6580e7cd7 (diff) |
rename: Move allsums.go to the rebuildmappings package
Diffstat (limited to 'lib/btrfsprogs')
-rw-r--r-- | lib/btrfsprogs/btrfsinspect/rebuildmappings/allsums.go (renamed from lib/btrfsprogs/btrfsinspect/allsums.go) | 27 | ||||
-rw-r--r-- | lib/btrfsprogs/btrfsinspect/rebuildmappings/gaps.go | 2 | ||||
-rw-r--r-- | lib/btrfsprogs/btrfsinspect/rebuildmappings/scan.go | 2 |
3 files changed, 16 insertions, 15 deletions
diff --git a/lib/btrfsprogs/btrfsinspect/allsums.go b/lib/btrfsprogs/btrfsinspect/rebuildmappings/allsums.go index e18555f..43d09fe 100644 --- a/lib/btrfsprogs/btrfsinspect/allsums.go +++ b/lib/btrfsprogs/btrfsinspect/rebuildmappings/allsums.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: GPL-2.0-or-later -package btrfsinspect +package rebuildmappings import ( "context" @@ -21,15 +21,16 @@ import ( "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfssum" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol" + "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect" "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsutil" ) type AllSums struct { - Logical []SumRun[btrfsvol.LogicalAddr] - Physical map[btrfsvol.DeviceID]SumRun[btrfsvol.PhysicalAddr] + Logical []btrfsinspect.SumRun[btrfsvol.LogicalAddr] + Physical map[btrfsvol.DeviceID]btrfsinspect.SumRun[btrfsvol.PhysicalAddr] } -func (as AllSums) SumForPAddr(paddr btrfsvol.QualifiedPhysicalAddr) (ShortSum, bool) { +func (as AllSums) SumForPAddr(paddr btrfsvol.QualifiedPhysicalAddr) (btrfsinspect.ShortSum, bool) { run, ok := as.Physical[paddr.Dev] if !ok { return "", false @@ -37,20 +38,20 @@ func (as AllSums) SumForPAddr(paddr btrfsvol.QualifiedPhysicalAddr) (ShortSum, b return run.SumForAddr(paddr.Addr) } -func (as AllSums) RunForLAddr(laddr btrfsvol.LogicalAddr) (SumRun[btrfsvol.LogicalAddr], btrfsvol.LogicalAddr, bool) { +func (as AllSums) RunForLAddr(laddr btrfsvol.LogicalAddr) (btrfsinspect.SumRun[btrfsvol.LogicalAddr], btrfsvol.LogicalAddr, bool) { for _, run := range as.Logical { if run.Addr > laddr { - return SumRun[btrfsvol.LogicalAddr]{}, run.Addr, false + return btrfsinspect.SumRun[btrfsvol.LogicalAddr]{}, run.Addr, false } if run.Addr.Add(run.Size()) <= laddr { continue } return run, 0, true } - return SumRun[btrfsvol.LogicalAddr]{}, math.MaxInt64, false + return btrfsinspect.SumRun[btrfsvol.LogicalAddr]{}, math.MaxInt64, false } -func (as AllSums) SumForLAddr(laddr btrfsvol.LogicalAddr) (ShortSum, bool) { +func (as AllSums) SumForLAddr(laddr btrfsvol.LogicalAddr) (btrfsinspect.ShortSum, bool) { run, _, ok := as.RunForLAddr(laddr) if !ok { return "", false @@ -58,7 +59,7 @@ func (as AllSums) SumForLAddr(laddr btrfsvol.LogicalAddr) (ShortSum, bool) { return run.SumForAddr(laddr) } -func (as AllSums) WalkLogical(ctx context.Context, fn func(btrfsvol.LogicalAddr, ShortSum) error) error { +func (as AllSums) WalkLogical(ctx context.Context, fn func(btrfsvol.LogicalAddr, btrfsinspect.ShortSum) error) error { for _, run := range as.Logical { if err := run.Walk(ctx, fn); err != nil { return err @@ -124,7 +125,7 @@ func SumEverything(ctx context.Context, fs *btrfs.FS) (AllSums, error) { laddr := btrfsvol.LogicalAddr(item.Key.Offset) + (btrfsvol.LogicalAddr(i) * btrfsitem.CSumBlockSize) if laddr != curAddr+(btrfsvol.LogicalAddr(curSums.Len()/csumSize)*btrfsitem.CSumBlockSize) { if curSums.Len() > 0 { - ret.Logical = append(ret.Logical, SumRun[btrfsvol.LogicalAddr]{ + ret.Logical = append(ret.Logical, btrfsinspect.SumRun[btrfsvol.LogicalAddr]{ ChecksumSize: csumSize, Addr: curAddr, Sums: curSums.String(), @@ -140,7 +141,7 @@ func SumEverything(ctx context.Context, fs *btrfs.FS) (AllSums, error) { }, ) if curSums.Len() > 0 { - ret.Logical = append(ret.Logical, SumRun[btrfsvol.LogicalAddr]{ + ret.Logical = append(ret.Logical, btrfsinspect.SumRun[btrfsvol.LogicalAddr]{ ChecksumSize: csumSize, Addr: curAddr, Sums: curSums.String(), @@ -160,7 +161,7 @@ func SumEverything(ctx context.Context, fs *btrfs.FS) (AllSums, error) { devs := fs.LV.PhysicalVolumes() var mu sync.Mutex - ret.Physical = make(map[btrfsvol.DeviceID]SumRun[btrfsvol.PhysicalAddr], len(devs)) + ret.Physical = make(map[btrfsvol.DeviceID]btrfsinspect.SumRun[btrfsvol.PhysicalAddr], len(devs)) grp := dgroup.NewGroup(ctx, dgroup.GroupConfig{}) for devID, dev := range devs { @@ -192,7 +193,7 @@ func SumEverything(ctx context.Context, fs *btrfs.FS) (AllSums, error) { progress(numSums) sumsStr := string(sums) mu.Lock() - ret.Physical[devID] = SumRun[btrfsvol.PhysicalAddr]{ + ret.Physical[devID] = btrfsinspect.SumRun[btrfsvol.PhysicalAddr]{ ChecksumSize: csumSize, Addr: 0, Sums: sumsStr, diff --git a/lib/btrfsprogs/btrfsinspect/rebuildmappings/gaps.go b/lib/btrfsprogs/btrfsinspect/rebuildmappings/gaps.go index f5fb27a..418dba6 100644 --- a/lib/btrfsprogs/btrfsinspect/rebuildmappings/gaps.go +++ b/lib/btrfsprogs/btrfsinspect/rebuildmappings/gaps.go @@ -56,7 +56,7 @@ func roundUp[T constraints.Integer](x, multiple T) T { } func WalkGaps(ctx context.Context, - sums btrfsinspect.AllSums, gaps map[btrfsvol.DeviceID][]PhysicalGap, + sums AllSums, gaps map[btrfsvol.DeviceID][]PhysicalGap, fn func(btrfsvol.DeviceID, btrfsinspect.SumRun[btrfsvol.PhysicalAddr]) error, ) error { for _, devID := range maps.SortedKeys(gaps) { diff --git a/lib/btrfsprogs/btrfsinspect/rebuildmappings/scan.go b/lib/btrfsprogs/btrfsinspect/rebuildmappings/scan.go index 83c4a31..d37d00f 100644 --- a/lib/btrfsprogs/btrfsinspect/rebuildmappings/scan.go +++ b/lib/btrfsprogs/btrfsinspect/rebuildmappings/scan.go @@ -20,7 +20,7 @@ import ( "git.lukeshu.com/btrfs-progs-ng/lib/slices" ) -func ScanForExtents(ctx context.Context, fs *btrfs.FS, blockgroups map[btrfsvol.LogicalAddr]BlockGroup, sums btrfsinspect.AllSums) error { +func ScanForExtents(ctx context.Context, fs *btrfs.FS, blockgroups map[btrfsvol.LogicalAddr]BlockGroup, sums AllSums) error { dlog.Info(ctx, "Pairing up blockgroups and sums...") bgSums := make(map[btrfsvol.LogicalAddr]btrfsinspect.SumRunWithGaps[btrfsvol.LogicalAddr]) for i, bgLAddr := range maps.SortedKeys(blockgroups) { |