diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2022-12-23 17:10:47 -0700 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2022-12-23 18:01:19 -0700 |
| commit | 51d6ccf1e5af4d88bfe6842b06fa1bc2d5cc732c (patch) | |
| tree | e91c8235c433ed6b78ce7f7e62408781dc14a249 /lib/btrfsprogs/btrfsinspect/rebuildnodes/rebuild.go | |
| parent | fc6f8871c39d3a74153e4ce8fd440c256f65b650 (diff) | |
rebuildnodes: Have keyio.Handle always be a pointer, fuss with ScanDevices return type
Diffstat (limited to 'lib/btrfsprogs/btrfsinspect/rebuildnodes/rebuild.go')
| -rw-r--r-- | lib/btrfsprogs/btrfsinspect/rebuildnodes/rebuild.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/btrfsprogs/btrfsinspect/rebuildnodes/rebuild.go b/lib/btrfsprogs/btrfsinspect/rebuildnodes/rebuild.go index 180edab..fecf5e6 100644 --- a/lib/btrfsprogs/btrfsinspect/rebuildnodes/rebuild.go +++ b/lib/btrfsprogs/btrfsinspect/rebuildnodes/rebuild.go @@ -34,7 +34,7 @@ type rebuilder struct { graph graph.Graph csums containers.RBTree[containers.NativeOrdered[btrfsvol.LogicalAddr], btrfsinspect.SysExtentCSum] - keyIO keyio.Handle + keyIO *keyio.Handle curKey keyio.KeyAndTree queue []keyio.KeyAndTree @@ -42,7 +42,7 @@ type rebuilder struct { } func RebuildNodes(ctx context.Context, fs *btrfs.FS, nodeScanResults btrfsinspect.ScanDevicesResult) (map[btrfsprim.ObjID]containers.Set[btrfsvol.LogicalAddr], error) { - scanData, err := ScanDevices(ctx, fs, nodeScanResults) // ScanDevices does its own logging + nodeGraph, keyIO, err := ScanDevices(ctx, fs, nodeScanResults) // ScanDevices does its own logging if err != nil { return nil, err } @@ -63,11 +63,11 @@ func RebuildNodes(ctx context.Context, fs *btrfs.FS, nodeScanResults btrfsinspec o := &rebuilder{ sb: *sb, - graph: *scanData.nodeGraph, + graph: nodeGraph, csums: *csums, - keyIO: *scanData.keyIO, + keyIO: keyIO, } - o.rebuilt = btrees.NewRebuiltTrees(*sb, *scanData.nodeGraph, *scanData.keyIO, + o.rebuilt = btrees.NewRebuiltTrees(*sb, nodeGraph, keyIO, o.cbAddedItem, o.cbLookupRoot, o.cbLookupUUID) if err := o.rebuild(ctx); err != nil { return nil, err |