From ee0d8981e501c86774f3ec45466d3273464921e8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 18 Aug 2022 01:12:13 -0600 Subject: Get inspect-scandevices to a decent-ish place --- lib/btrfsprogs/btrfsinspect/scandevices.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/btrfsprogs/btrfsinspect/scandevices.go b/lib/btrfsprogs/btrfsinspect/scandevices.go index 1f1ba80..b0ec0ff 100644 --- a/lib/btrfsprogs/btrfsinspect/scandevices.go +++ b/lib/btrfsprogs/btrfsinspect/scandevices.go @@ -22,7 +22,7 @@ import ( type ScanDevicesResult map[btrfsvol.DeviceID]ScanOneDeviceResult -func ScanDevices(ctx context.Context, fs *btrfs.FS, sb btrfs.Superblock) (ScanDevicesResult, error) { +func ScanDevices(ctx context.Context, fs *btrfs.FS) (ScanDevicesResult, error) { grp := dgroup.NewGroup(ctx, dgroup.GroupConfig{}) var mu sync.Mutex result := make(map[btrfsvol.DeviceID]ScanOneDeviceResult) @@ -30,7 +30,11 @@ func ScanDevices(ctx context.Context, fs *btrfs.FS, sb btrfs.Superblock) (ScanDe id := id dev := dev grp.Go(dev.Name(), func(ctx context.Context) error { - devResult, err := ScanOneDevice(ctx, dev, sb) + sb, err := dev.Superblock() + if err != nil { + return err + } + devResult, err := ScanOneDevice(ctx, dev, *sb) if err != nil { return err } -- cgit v1.2.3-2-g168b