diskio.File: Add .Close() and don't have .Size() return an error

1 files changed, 2 insertions, 22 deletions

diff --git a/lib/btrfs/io1_pv.go b/lib/btrfs/io1_pv.go
index 10b6e32..df31671 100644
--- a/lib/btrfs/io1_pv.go
+++ b/lib/btrfs/io1_pv.go
@@ -6,7 +6,6 @@ package btrfs
 
 import (
 	"fmt"
-	"os"
 
 	"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
@@ -14,7 +13,7 @@ import (
 )
 
 type Device struct {
-	*os.File
+	diskio.File[btrfsvol.PhysicalAddr]
 
 	cacheSuperblocks []*diskio.Ref[btrfsvol.PhysicalAddr, Superblock]
 	cacheSuperblock  *Superblock
@@ -22,22 +21,6 @@ type Device struct {
 
 var _ diskio.File[btrfsvol.PhysicalAddr] = (*Device)(nil)
 
-func (dev Device) Size() (btrfsvol.PhysicalAddr, error) {
-	fi, err := dev.Stat()
-	if err != nil {
-		return 0, err
-	}
-	return btrfsvol.PhysicalAddr(fi.Size()), nil
-}
-
-func (dev *Device) ReadAt(dat []byte, paddr btrfsvol.PhysicalAddr) (int, error) {
-	return dev.File.ReadAt(dat, int64(paddr))
-}
-
-func (dev *Device) WriteAt(dat []byte, paddr btrfsvol.PhysicalAddr) (int, error) {
-	return dev.File.WriteAt(dat, int64(paddr))
-}
-
 var SuperblockAddrs = []btrfsvol.PhysicalAddr{
 	0x00_0001_0000, // 64KiB
 	0x00_0400_0000, // 64MiB
@@ -50,10 +33,7 @@ func (dev *Device) Superblocks() ([]*diskio.Ref[btrfsvol.PhysicalAddr, Superbloc
 	}
 	superblockSize := btrfsvol.PhysicalAddr(binstruct.StaticSize(Superblock{}))
 
-	sz, err := dev.Size()
-	if err != nil {
-		return nil, err
-	}
+	sz := dev.Size()
 
 	var ret []*diskio.Ref[btrfsvol.PhysicalAddr, Superblock]
 	for i, addr := range SuperblockAddrs {