diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2022-08-23 20:28:30 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2022-08-23 20:29:25 -0600 |
| commit | 9c46c8d8b447ff5e0a5ee688b15ef23034e6ce30 (patch) | |
| tree | dd9be19efb43ea7fd245b46177dad7c7669bf658 /cmd/btrfs-rec/inspect_dbgsums.go | |
| parent | aaa85c40b2f8c5c4d107aaf3dee47901342fac78 (diff) | |
Work on the new rebuildmappings
rebuildmappings.go didn't actually change very much, but was reworked to
be multi-device, so the diff looks like it totally changed.
Diffstat (limited to 'cmd/btrfs-rec/inspect_dbgsums.go')
| -rw-r--r-- | cmd/btrfs-rec/inspect_dbgsums.go | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/cmd/btrfs-rec/inspect_dbgsums.go b/cmd/btrfs-rec/inspect_dbgsums.go index 8e230f4..b46a305 100644 --- a/cmd/btrfs-rec/inspect_dbgsums.go +++ b/cmd/btrfs-rec/inspect_dbgsums.go @@ -18,7 +18,6 @@ import ( "git.lukeshu.com/btrfs-progs-ng/lib/btrfs" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfssum" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol" - "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect" "git.lukeshu.com/btrfs-progs-ng/lib/maps" ) @@ -37,19 +36,10 @@ func init() { ctx := cmd.Context() dlog.Infof(ctx, "Reading %q...", args[0]) - scanResults, err := func() (btrfsinspect.ScanDevicesResult, error) { - fh, err := os.Open(args[0]) - if err != nil { - return nil, err - } - var scanResults btrfsinspect.ScanDevicesResult - buf := bufio.NewReader(fh) - if err := lowmemjson.DecodeThenEOF(buf, &scanResults); err != nil { - return nil, err - } - _ = fh.Close() - return scanResults, nil - }() + scanResults, err := readScanResults(args[0]) + if err != nil { + return err + } dlog.Infof(ctx, "... done reading %q", args[0]) dlog.Info(ctx, "Mapping the logical address space...") |