From a0daaacdd61f196fbc0ca90ed996e7eeb4d4fcdd Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 11 Jul 2022 22:48:35 -0600 Subject: move chunk reconstruction to btrfsinspect, add --mappings --- lib/btrfsprogs/btrfsutil/open.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'lib/btrfsprogs/btrfsutil/open.go') 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 -- cgit v1.2.3-54-g00ecf