summaryrefslogtreecommitdiff
path: root/lib/btrfs/io1_pv.go
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2022-07-13 21:10:10 -0600
committerLuke Shumaker <lukeshu@lukeshu.com>2022-07-13 21:51:12 -0600
commit166e51d3a6f81834cc89aec36015f05f350be31e (patch)
tree122745341f3431b2220448d7d71965cd3e84aa97 /lib/btrfs/io1_pv.go
parent296e9fc0f8812ce0c5684ff99f84e80eef07cd4c (diff)
Fix package names/imports
Diffstat (limited to 'lib/btrfs/io1_pv.go')
-rw-r--r--lib/btrfs/io1_pv.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/btrfs/io1_pv.go b/lib/btrfs/io1_pv.go
index 44a8d76..10b6e32 100644
--- a/lib/btrfs/io1_pv.go
+++ b/lib/btrfs/io1_pv.go
@@ -10,17 +10,17 @@ import (
"git.lukeshu.com/btrfs-progs-ng/lib/binstruct"
"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
- "git.lukeshu.com/btrfs-progs-ng/lib/util"
+ "git.lukeshu.com/btrfs-progs-ng/lib/diskio"
)
type Device struct {
*os.File
- cacheSuperblocks []*util.Ref[btrfsvol.PhysicalAddr, Superblock]
+ cacheSuperblocks []*diskio.Ref[btrfsvol.PhysicalAddr, Superblock]
cacheSuperblock *Superblock
}
-var _ util.File[btrfsvol.PhysicalAddr] = (*Device)(nil)
+var _ diskio.File[btrfsvol.PhysicalAddr] = (*Device)(nil)
func (dev Device) Size() (btrfsvol.PhysicalAddr, error) {
fi, err := dev.Stat()
@@ -44,7 +44,7 @@ var SuperblockAddrs = []btrfsvol.PhysicalAddr{
0x40_0000_0000, // 256GiB
}
-func (dev *Device) Superblocks() ([]*util.Ref[btrfsvol.PhysicalAddr, Superblock], error) {
+func (dev *Device) Superblocks() ([]*diskio.Ref[btrfsvol.PhysicalAddr, Superblock], error) {
if dev.cacheSuperblocks != nil {
return dev.cacheSuperblocks, nil
}
@@ -55,10 +55,10 @@ func (dev *Device) Superblocks() ([]*util.Ref[btrfsvol.PhysicalAddr, Superblock]
return nil, err
}
- var ret []*util.Ref[btrfsvol.PhysicalAddr, Superblock]
+ var ret []*diskio.Ref[btrfsvol.PhysicalAddr, Superblock]
for i, addr := range SuperblockAddrs {
if addr+superblockSize <= sz {
- superblock := &util.Ref[btrfsvol.PhysicalAddr, Superblock]{
+ superblock := &diskio.Ref[btrfsvol.PhysicalAddr, Superblock]{
File: dev,
Addr: addr,
}