From ff28ac9487ceb162bdef47f0639ce9a6c0cc7c28 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 17 Aug 2022 20:48:50 -0600 Subject: rename: Move some files around --- cmd/btrfs-rec/inspect_dumpsums.go | 6 +++--- cmd/btrfs-rec/inspect_scanforextents.go | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'cmd/btrfs-rec') 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 } -- cgit v1.2.3-2-g168b