move chunk reconstruction to btrfsinspect, add --mappings

2 files changed, 13 insertions, 6 deletions

diff --git a/lib/btrfsprogs/btrfsutil/open.go b/lib/btrfsprogs/btrfsutil/open.go
index cc081a6..80bfe7a 100644
--- a/lib/btrfsprogs/btrfsutil/open.go
+++ b/lib/btrfsprogs/btrfsutil/open.go
@@ -5,23 +5,26 @@
 package btrfsutil
 
 import (
+	"context"
 	"fmt"
 	"os"
 
+	"github.com/datawire/dlib/dlog"
+
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
 )
 
-func Open(flag int, filenames ...string) (*btrfs.FS, error) {
+func Open(ctx context.Context, flag int, filenames ...string) (*btrfs.FS, error) {
 	fs := new(btrfs.FS)
-	for _, filename := range filenames {
+	for i, filename := range filenames {
+		dlog.Debugf(ctx, "Adding device file %d/%d %q...", i, len(filenames), filename)
 		fh, err := os.OpenFile(filename, flag, 0)
 		if err != nil {
 			_ = fs.Close()
-			return nil, fmt.Errorf("file %q: %w", filename, err)
+			return nil, fmt.Errorf("device file %q: %w", filename, err)
 		}
 		if err := fs.AddDevice(&btrfs.Device{File: fh}); err != nil {
-			_ = fs.Close()
-			return nil, fmt.Errorf("file %q: %w", filename, err)
+			dlog.Errorf(ctx, "device file %q: %v", filename, err)
 		}
 	}
 	return fs, nil
diff --git a/lib/btrfsprogs/btrfsutil/scan.go b/lib/btrfsprogs/btrfsutil/scan.go
index d83525c..02d4124 100644
--- a/lib/btrfsprogs/btrfsutil/scan.go
+++ b/lib/btrfsprogs/btrfsutil/scan.go
@@ -5,6 +5,7 @@
 package btrfsutil
 
 import (
+	"context"
 	"errors"
 	"fmt"
 
@@ -17,7 +18,7 @@ import (
 // cmds/rescue-chunk-recover.c:scan_one_device(), except rather than
 // doing something itself when it finds a node, it simply calls a
 // callback function.
-func ScanForNodes(dev *btrfs.Device, sb btrfs.Superblock, fn func(*util.Ref[btrfsvol.PhysicalAddr, btrfs.Node], error), prog func(btrfsvol.PhysicalAddr)) error {
+func ScanForNodes(ctx context.Context, dev *btrfs.Device, sb btrfs.Superblock, fn func(*util.Ref[btrfsvol.PhysicalAddr, btrfs.Node], error), prog func(btrfsvol.PhysicalAddr)) error {
 	devSize, err := dev.Size()
 	if err != nil {
 		return err
@@ -29,6 +30,9 @@ func ScanForNodes(dev *btrfs.Device, sb btrfs.Superblock, fn func(*util.Ref[btrf
 	}
 
 	for pos := btrfsvol.PhysicalAddr(0); pos+btrfsvol.PhysicalAddr(sb.NodeSize) < devSize; pos += btrfsvol.PhysicalAddr(sb.SectorSize) {
+		if ctx.Err() != nil {
+			return ctx.Err()
+		}
 		if util.InSlice(pos, btrfs.SuperblockAddrs) {
 			//fmt.Printf("sector@%v is a superblock\n", pos)
 			continue