diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2022-12-21 04:30:56 -0700 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2022-12-22 02:40:51 -0700 |
| commit | 7620e1948a4d1e17458d8cfc9ed306bb774a3274 (patch) | |
| tree | b65761ee1bb3e1651038d1e2bfeb4e99c33dcf85 /lib/btrfsprogs/btrfsinspect/rebuildnodes/scan.go | |
| parent | 30be1eacbe4ff253c82c6e6163234dc20b4de550 (diff) | |
rebuildnodes: Migrate to the new rebuilt-btrees system
Diffstat (limited to 'lib/btrfsprogs/btrfsinspect/rebuildnodes/scan.go')
| -rw-r--r-- | lib/btrfsprogs/btrfsinspect/rebuildnodes/scan.go | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/lib/btrfsprogs/btrfsinspect/rebuildnodes/scan.go b/lib/btrfsprogs/btrfsinspect/rebuildnodes/scan.go index 7e01693..8c519fc 100644 --- a/lib/btrfsprogs/btrfsinspect/rebuildnodes/scan.go +++ b/lib/btrfsprogs/btrfsinspect/rebuildnodes/scan.go @@ -17,14 +17,11 @@ import ( "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect" "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect/rebuildnodes/graph" "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect/rebuildnodes/keyio" - "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect/rebuildnodes/uuidmap" "git.lukeshu.com/btrfs-progs-ng/lib/containers" - "git.lukeshu.com/btrfs-progs-ng/lib/maps" "git.lukeshu.com/btrfs-progs-ng/lib/textui" ) type scanResult struct { - uuidMap *uuidmap.UUIDMap nodeGraph *graph.Graph keyIO *keyio.Handle } @@ -55,7 +52,6 @@ func ScanDevices(ctx context.Context, fs *btrfs.FS, scanResults btrfsinspect.Sca } ret := &scanResult{ - uuidMap: uuidmap.New(), nodeGraph: graph.New(*sb), } ret.keyIO = keyio.NewHandle(fs, *sb, ret.nodeGraph) @@ -70,10 +66,6 @@ func ScanDevices(ctx context.Context, fs *btrfs.FS, scanResults btrfsinspect.Sca return nil, err } - if err := ret.uuidMap.InsertNode(nodeRef); err != nil { - return nil, err - } - ret.nodeGraph.InsertNode(nodeRef) ret.keyIO.InsertNode(nodeRef) @@ -85,12 +77,6 @@ func ScanDevices(ctx context.Context, fs *btrfs.FS, scanResults btrfsinspect.Sca panic("should not happen") } progressWriter.Done() - - missing := ret.uuidMap.MissingRootItems() - if len(missing) > 0 { - dlog.Errorf(ctx, "... could not find root items for %d trees: %v", len(missing), maps.SortedKeys(missing)) - } - dlog.Info(ctx, "... done reading node data") progressWriter = textui.NewProgress[scanStats](ctx, dlog.LogLevelInfo, 1*time.Second) |