From 5411e6b88bdccff020c4de25c065a0ba4710589c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 29 Aug 2022 23:18:26 -0600 Subject: wip --- lib/btrfsprogs/btrfsinspect/rebuildnodes/rebuildnodes.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'lib/btrfsprogs/btrfsinspect/rebuildnodes/rebuildnodes.go') diff --git a/lib/btrfsprogs/btrfsinspect/rebuildnodes/rebuildnodes.go b/lib/btrfsprogs/btrfsinspect/rebuildnodes/rebuildnodes.go index 941ea4c..a9ff24d 100644 --- a/lib/btrfsprogs/btrfsinspect/rebuildnodes/rebuildnodes.go +++ b/lib/btrfsprogs/btrfsinspect/rebuildnodes/rebuildnodes.go @@ -31,17 +31,12 @@ func RebuildNodes(ctx context.Context, fs *btrfs.FS, nodeScanResults btrfsinspec uuidMap: uuidMap, } - foundRoots, err := lostAndFoundNodes(ctx, nfs, nodeScanResults) + orphanedNodes, rebuiltNodes, err := classifyNodes(ctx, nfs, nodeScanResults) if err != nil { return nil, err } - rebuiltNodes, err := reInitBrokenNodes(ctx, nfs, nodeScanResults, foundRoots) - if err != nil { - return nil, err - } - - if err := reAttachNodes(ctx, nfs, foundRoots, rebuiltNodes); err != nil { + if err := reAttachNodes(ctx, nfs, orphanedNodes, rebuiltNodes); err != nil { return nil, err } -- cgit v1.2.3-2-g168b