From 974f9584fe3ec0d046225f191b4c4f079901135d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 5 Oct 2022 10:02:43 -0600 Subject: fix ls-trees lost+found --- cmd/btrfs-rec/inspect_lstrees.go | 12 ++++++------ scripts/main.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/btrfs-rec/inspect_lstrees.go b/cmd/btrfs-rec/inspect_lstrees.go index f97eb2b..54c2074 100644 --- a/cmd/btrfs-rec/inspect_lstrees.go +++ b/cmd/btrfs-rec/inspect_lstrees.go @@ -28,7 +28,7 @@ import ( ) func init() { - var nodescanFilename string + var scandevicesFilename string cmd := subcommand{ Command: cobra.Command{ Use: "ls-trees", @@ -37,8 +37,8 @@ func init() { }, RunE: func(fs *btrfs.FS, cmd *cobra.Command, _ []string) error { var scanResults map[btrfsvol.DeviceID]btrfsinspect.ScanOneDeviceResult - if nodescanFilename != "" { - scanResultsBytes, err := os.ReadFile(nodescanFilename) + if scandevicesFilename != "" { + scanResultsBytes, err := os.ReadFile(scandevicesFilename) if err != nil { return err } @@ -95,7 +95,7 @@ func init() { }, }) - if nodescanFilename != "" { + if scandevicesFilename != "" { treeErrCnt = 0 treeItemCnt = make(map[btrfsitem.Type]int) fmt.Printf("lost+found\n") @@ -125,8 +125,8 @@ func init() { return nil }, } - cmd.Command.Flags().StringVar(&nodescanFilename, "nodescan", "", "Output of scan-for-nodes to use for a lost+found tree") - if err := cmd.Command.MarkFlagFilename("nodescan"); err != nil { + cmd.Command.Flags().StringVar(&scandevicesFilename, "scandevices", "", "Output of 'scandevices' to use for a lost+found tree") + if err := cmd.Command.MarkFlagFilename("scandevices"); err != nil { panic(err) } inspectors = append(inspectors, cmd) diff --git a/scripts/main.sh b/scripts/main.sh index 5bfd1ef..dcf0117 100755 --- a/scripts/main.sh +++ b/scripts/main.sh @@ -38,4 +38,4 @@ gen $b.gen/3.ls-files.txt \ inspect ls-files gen $b.gen/3.ls-trees.txt \ ./btrfs-rec --pv=$b.img --mappings=$b.gen/1.mappings.json \ - inspect ls-trees + inspect ls-trees --scandevices=$b.gen/0.scandevices.json -- cgit v1.2.3-54-g00ecf