From e784de8a66c3645fdd3a54939b5b844f3bacd82d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Wed, 13 Jul 2022 23:55:59 -0600
Subject: diskio.File: Add .Close() and don't have .Size() return an error

---
 lib/btrfsprogs/btrfsutil/open.go | 12 ++++++++++--
 lib/btrfsprogs/btrfsutil/scan.go |  5 +----
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'lib/btrfsprogs/btrfsutil')

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)
 		}
 	}
diff --git a/lib/btrfsprogs/btrfsutil/scan.go b/lib/btrfsprogs/btrfsutil/scan.go
index dd77747..d5d3d8d 100644
--- a/lib/btrfsprogs/btrfsutil/scan.go
+++ b/lib/btrfsprogs/btrfsutil/scan.go
@@ -20,10 +20,7 @@ import (
 // doing something itself when it finds a node, it simply calls a
 // callback function.
 func ScanForNodes(ctx context.Context, dev *btrfs.Device, sb btrfs.Superblock, fn func(*diskio.Ref[btrfsvol.PhysicalAddr, btrfs.Node], error), prog func(btrfsvol.PhysicalAddr)) error {
-	devSize, err := dev.Size()
-	if err != nil {
-		return err
-	}
+	devSize := dev.Size()
 
 	if sb.NodeSize < sb.SectorSize {
 		return fmt.Errorf("node_size(%v) < sector_size(%v)",
-- 
cgit v1.2.3-2-g168b