From 8463b2bff37978124e5210a59590f1ac33e453c0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 26 Jun 2022 22:19:29 -0600 Subject: use devid instead of devuuid, add a Mapping struct --- pkg/btrfs/btrfsvol/addr.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkg/btrfs/btrfsvol/addr.go') diff --git a/pkg/btrfs/btrfsvol/addr.go b/pkg/btrfs/btrfsvol/addr.go index e8b578a..b426611 100644 --- a/pkg/btrfs/btrfsvol/addr.go +++ b/pkg/btrfs/btrfsvol/addr.go @@ -32,13 +32,15 @@ func (a LogicalAddr) Sub(b LogicalAddr) AddrDelta { return AddrDelta(a - b) } func (a PhysicalAddr) Add(b AddrDelta) PhysicalAddr { return a + PhysicalAddr(b) } func (a LogicalAddr) Add(b AddrDelta) LogicalAddr { return a + LogicalAddr(b) } +type DeviceID uint64 + type QualifiedPhysicalAddr struct { - Dev util.UUID + Dev DeviceID Addr PhysicalAddr } func (a QualifiedPhysicalAddr) Cmp(b QualifiedPhysicalAddr) int { - if d := a.Dev.Cmp(b.Dev); d != 0 { + if d := int(a.Dev - b.Dev); d != 0 { return d } return int(a.Addr - b.Addr) -- cgit v1.2.3-2-g168b