diff options
| -rw-r--r-- | cmd/btrfs-rec/inspect_dumpgraph.go | 44 | ||||
| -rw-r--r-- | lib/btrfsprogs/btrfsinspect/rebuildnodes/loops.go | 27 | ||||
| -rwxr-xr-x | scripts/main.sh | 3 |
3 files changed, 0 insertions, 74 deletions
diff --git a/cmd/btrfs-rec/inspect_dumpgraph.go b/cmd/btrfs-rec/inspect_dumpgraph.go deleted file mode 100644 index 8e803d3..0000000 --- a/cmd/btrfs-rec/inspect_dumpgraph.go +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (C) 2022 Luke Shumaker <lukeshu@lukeshu.com> -// -// SPDX-License-Identifier: GPL-2.0-or-later - -package main - -import ( - "bufio" - "os" - - "github.com/datawire/dlib/dlog" - "github.com/datawire/ocibuild/pkg/cliutil" - "github.com/spf13/cobra" - - "git.lukeshu.com/btrfs-progs-ng/lib/btrfs" - "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect/rebuildnodes" -) - -func init() { - inspectors = append(inspectors, subcommand{ - Command: cobra.Command{ - Use: "show-loops NODESCAN.json", - Args: cliutil.WrapPositionalArgs(cobra.ExactArgs(1)), - }, - RunE: func(fs *btrfs.FS, cmd *cobra.Command, args []string) (err error) { - ctx := cmd.Context() - - dlog.Infof(ctx, "Reading %q...", args[0]) - nodeScanResults, err := readScanResults(args[0]) - if err != nil { - return err - } - dlog.Infof(ctx, "... done reading %q", args[0]) - - buffer := bufio.NewWriter(os.Stdout) - defer func() { - if _err := buffer.Flush(); err == nil && _err != nil { - err = _err - } - }() - return rebuildnodes.ShowLoops(ctx, buffer, fs, nodeScanResults) - }, - }) -} diff --git a/lib/btrfsprogs/btrfsinspect/rebuildnodes/loops.go b/lib/btrfsprogs/btrfsinspect/rebuildnodes/loops.go deleted file mode 100644 index 57eb139..0000000 --- a/lib/btrfsprogs/btrfsinspect/rebuildnodes/loops.go +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (C) 2022 Luke Shumaker <lukeshu@lukeshu.com> -// -// SPDX-License-Identifier: GPL-2.0-or-later - -package rebuildnodes - -import ( - "context" - "io" - - "github.com/datawire/dlib/dlog" - - "git.lukeshu.com/btrfs-progs-ng/lib/btrfs" - "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect" -) - -func ShowLoops(ctx context.Context, out io.Writer, fs *btrfs.FS, nodeScanResults btrfsinspect.ScanDevicesResult) error { - scanData, err := ScanDevices(ctx, fs, nodeScanResults) - if err != nil { - return err - } - - dlog.Info(ctx, "Walking graph...") - scanData.nodeGraph.ShowLoops(out) - - return nil -} diff --git a/scripts/main.sh b/scripts/main.sh index 2866baa..19f3eea 100755 --- a/scripts/main.sh +++ b/scripts/main.sh @@ -48,9 +48,6 @@ gen $b.gen/2.mappings.json \ -e '2a{"LAddr":13631488,"PAddr":{"Dev":1,"Addr":13631488},"Size":1},') \ inspect rebuild-mappings $b.gen/0.scandevices.json -# gen $b.gen/2.loops.txt \ -# ./btrfs-rec --pv=$b.img --mappings=$b.gen/2.mappings.json \ -# inspect show-loops $b.gen/0.scandevices.json gen $b.gen/3.nodes.json \ ./btrfs-rec --pv=$b.img --mappings=$b.gen/2.mappings.json \ inspect rebuild-nodes $b.gen/0.scandevices.json |