diff options
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/btrfs-rec/inspect_dumpsums.go | 6 | ||||
-rw-r--r-- | cmd/btrfs-rec/inspect_scanforextents.go | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/cmd/btrfs-rec/inspect_dumpsums.go b/cmd/btrfs-rec/inspect_dumpsums.go index ae159d1..3d0da39 100644 --- a/cmd/btrfs-rec/inspect_dumpsums.go +++ b/cmd/btrfs-rec/inspect_dumpsums.go @@ -12,7 +12,7 @@ import ( "github.com/spf13/cobra" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs" - "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect/scanforextents" + "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect" ) func init() { @@ -24,12 +24,12 @@ func init() { }, RunE: func(fs *btrfs.FS, cmd *cobra.Command, _ []string) error { ctx := cmd.Context() - sums, err := scanforextents.SumEverything(ctx, fs) + sums, err := btrfsinspect.SumEverything(ctx, fs) if err != nil { return err } dlog.Info(ctx, "Writing sums as gob to stdout...") - return scanforextents.WriteAllSums(os.Stdout, sums) + return btrfsinspect.WriteAllSums(os.Stdout, sums) }, }) } diff --git a/cmd/btrfs-rec/inspect_scanforextents.go b/cmd/btrfs-rec/inspect_scanforextents.go index 5f763d9..ac23e6d 100644 --- a/cmd/btrfs-rec/inspect_scanforextents.go +++ b/cmd/btrfs-rec/inspect_scanforextents.go @@ -13,7 +13,8 @@ import ( "github.com/spf13/cobra" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs" - "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect/scanforextents" + "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect" + "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect/rebuildmappings" ) func init() { @@ -26,7 +27,7 @@ func init() { ctx := cmd.Context() dlog.Infof(ctx, "Reading %q...", args[0]) - bgs, err := scanforextents.ReadNodeScanResults(fs, args[0]) + bgs, err := rebuildmappings.ReadNodeScanResults(fs, args[0]) if err != nil { return err } @@ -34,13 +35,13 @@ func init() { dlog.Infof(ctx, "... done reading %q", args[0]) dlog.Infof(ctx, "Reading %q...", args[1]) - sums, err := scanforextents.ReadAllSums(args[1]) + sums, err := btrfsinspect.ReadAllSums(args[1]) if err != nil { return err } dlog.Infof(ctx, "... done reading %q", args[1]) - if err := scanforextents.ScanForExtents(ctx, fs, bgs, sums); err != nil { + if err := rebuildmappings.ScanForExtents(ctx, fs, bgs, sums); err != nil { return err } |