rebuildnodes: Have keyio.Handle always be a pointer, fuss with ScanDevices return type

1 files changed, 10 insertions, 17 deletions

diff --git a/lib/btrfsprogs/btrfsinspect/rebuildnodes/scan.go b/lib/btrfsprogs/btrfsinspect/rebuildnodes/scan.go
index 8c519fc..93d3e0c 100644
--- a/lib/btrfsprogs/btrfsinspect/rebuildnodes/scan.go
+++ b/lib/btrfsprogs/btrfsinspect/rebuildnodes/scan.go
@@ -21,11 +21,6 @@ import (
 	"git.lukeshu.com/btrfs-progs-ng/lib/textui"
 )
 
-type scanResult struct {
-	nodeGraph *graph.Graph
-	keyIO     *keyio.Handle
-}
-
 type scanStats struct {
 	N, D int
 }
@@ -36,12 +31,12 @@ func (s scanStats) String() string {
 		s.N, s.D)
 }
 
-func ScanDevices(ctx context.Context, fs *btrfs.FS, scanResults btrfsinspect.ScanDevicesResult) (*scanResult, error) {
+func ScanDevices(ctx context.Context, fs *btrfs.FS, scanResults btrfsinspect.ScanDevicesResult) (graph.Graph, *keyio.Handle, error) {
 	dlog.Infof(ctx, "Reading node data from FS...")
 
 	sb, err := fs.Superblock()
 	if err != nil {
-		return nil, err
+		return graph.Graph{}, nil, err
 	}
 
 	total := countNodes(scanResults)
@@ -51,10 +46,8 @@ func ScanDevices(ctx context.Context, fs *btrfs.FS, scanResults btrfsinspect.Sca
 		progressWriter.Set(scanStats{N: done, D: total})
 	}
 
-	ret := &scanResult{
-		nodeGraph: graph.New(*sb),
-	}
-	ret.keyIO = keyio.NewHandle(fs, *sb, ret.nodeGraph)
+	nodeGraph := graph.New(*sb)
+	keyIO := keyio.NewHandle(fs, *sb, nodeGraph)
 
 	progress(done, total)
 	for _, devResults := range scanResults {
@@ -63,11 +56,11 @@ func ScanDevices(ctx context.Context, fs *btrfs.FS, scanResults btrfsinspect.Sca
 				LAddr: containers.Optional[btrfsvol.LogicalAddr]{OK: true, Val: laddr},
 			})
 			if err != nil {
-				return nil, err
+				return graph.Graph{}, nil, err
 			}
 
-			ret.nodeGraph.InsertNode(nodeRef)
-			ret.keyIO.InsertNode(nodeRef)
+			nodeGraph.InsertNode(nodeRef)
+			keyIO.InsertNode(nodeRef)
 
 			done++
 			progress(done, total)
@@ -81,11 +74,11 @@ func ScanDevices(ctx context.Context, fs *btrfs.FS, scanResults btrfsinspect.Sca
 
 	progressWriter = textui.NewProgress[scanStats](ctx, dlog.LogLevelInfo, 1*time.Second)
 	dlog.Infof(ctx, "Checking keypointers for dead-ends...")
-	if err := ret.nodeGraph.FinalCheck(fs, *sb, progress); err != nil {
-		return nil, err
+	if err := nodeGraph.FinalCheck(fs, *sb, progress); err != nil {
+		return graph.Graph{}, nil, err
 	}
 	progressWriter.Done()
 	dlog.Info(ctx, "... done checking keypointers")
 
-	return ret, nil
+	return *nodeGraph, keyIO, nil
 }