From 432fcca3deb80e7faa362e508604238ce295053d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 2 Aug 2022 03:30:54 -0600 Subject: lib: feat: Add ScanDevices --- lib/btrfsprogs/btrfsinspect/rebuildmappings/blockgroups.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lib/btrfsprogs/btrfsinspect/rebuildmappings') diff --git a/lib/btrfsprogs/btrfsinspect/rebuildmappings/blockgroups.go b/lib/btrfsprogs/btrfsinspect/rebuildmappings/blockgroups.go index 15df6da..2621c44 100644 --- a/lib/btrfsprogs/btrfsinspect/rebuildmappings/blockgroups.go +++ b/lib/btrfsprogs/btrfsinspect/rebuildmappings/blockgroups.go @@ -16,8 +16,6 @@ import ( "git.lukeshu.com/btrfs-progs-ng/lib/maps" ) -type NodeScanResults = map[btrfsvol.DeviceID]btrfsinspect.ScanOneDeviceResult - type BlockGroup struct { LAddr btrfsvol.LogicalAddr Size btrfsvol.AddrDelta @@ -30,7 +28,7 @@ func ReadNodeScanResults(fs *btrfs.FS, filename string) (map[btrfsvol.LogicalAdd return nil, err } - var scanResults NodeScanResults + var scanResults btrfsinspect.ScanDevicesResult if err := json.Unmarshal(scanResultsBytes, &scanResults); err != nil { return nil, err } @@ -43,7 +41,7 @@ func ReadNodeScanResults(fs *btrfs.FS, filename string) (map[btrfsvol.LogicalAdd return bgTree, nil } -func ReduceScanResults(fs *btrfs.FS, scanResults NodeScanResults) (map[btrfsvol.LogicalAddr]BlockGroup, error) { +func ReduceScanResults(fs *btrfs.FS, scanResults btrfsinspect.ScanDevicesResult) (map[btrfsvol.LogicalAddr]BlockGroup, error) { // Reduce bgSet := make(map[BlockGroup]struct{}) for _, found := range scanResults { -- cgit v1.2.3-2-g168b