diff options
Diffstat (limited to 'lib/btrfsprogs/btrfsutil/open.go')
| -rw-r--r-- | lib/btrfsprogs/btrfsutil/open.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/btrfsprogs/btrfsutil/open.go b/lib/btrfsprogs/btrfsutil/open.go index c237b54..0f3b32a 100644 --- a/lib/btrfsprogs/btrfsutil/open.go +++ b/lib/btrfsprogs/btrfsutil/open.go @@ -12,18 +12,26 @@ import ( "github.com/datawire/dlib/dlog" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs" + "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol" + "git.lukeshu.com/btrfs-progs-ng/lib/diskio" ) func Open(ctx context.Context, flag int, filenames ...string) (*btrfs.FS, error) { fs := new(btrfs.FS) 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) + osFile, err := os.OpenFile(filename, flag, 0) if err != nil { _ = fs.Close() return nil, fmt.Errorf("device file %q: %w", filename, err) } - if err := fs.AddDevice(ctx, &btrfs.Device{File: fh}); err != nil { + typedFile := &diskio.OSFile[btrfsvol.PhysicalAddr]{ + File: osFile, + } + devFile := &btrfs.Device{ + File: typedFile, + } + if err := fs.AddDevice(ctx, devFile); err != nil { return nil, fmt.Errorf("device file %q: %w", filename, err) } } |