From 5627aaea2c15a6fa8cca202614119f72972be37f Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Fri, 15 Jul 2022 14:36:47 -0600
Subject: tidy up

---
 lib/btrfs/btrfsvol/lvm.go | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'lib/btrfs/btrfsvol/lvm.go')

diff --git a/lib/btrfs/btrfsvol/lvm.go b/lib/btrfs/btrfsvol/lvm.go
index 149c8cd..9b16e10 100644
--- a/lib/btrfs/btrfsvol/lvm.go
+++ b/lib/btrfs/btrfsvol/lvm.go
@@ -113,8 +113,8 @@ type Mapping struct {
 	LAddr      LogicalAddr
 	PAddr      QualifiedPhysicalAddr
 	Size       AddrDelta
-	SizeLocked bool             `json:",omitempty"`
-	Flags      *BlockGroupFlags `json:",omitempty"`
+	SizeLocked bool                                 `json:",omitempty"`
+	Flags      containers.Optional[BlockGroupFlags] `json:",omitempty"`
 }
 
 func (lv *LogicalVolume[PhysicalVolume]) AddMapping(m Mapping) error {
@@ -232,17 +232,12 @@ func (lv *LogicalVolume[PhysicalVolume]) Mappings() []Mapping {
 	var ret []Mapping
 	_ = lv.logical2physical.Walk(func(node *containers.RBNode[chunkMapping]) error {
 		chunk := node.Value
-		var flags *BlockGroupFlags
-		if chunk.Flags != nil {
-			val := *chunk.Flags
-			flags = &val
-		}
 		for _, slice := range chunk.PAddrs {
 			ret = append(ret, Mapping{
 				LAddr: chunk.LAddr,
 				PAddr: slice,
 				Size:  chunk.Size,
-				Flags: flags,
+				Flags: chunk.Flags,
 			})
 		}
 		return nil
@@ -264,10 +259,7 @@ func (lv *LogicalVolume[PhysicalVolume]) Resolve(laddr LogicalAddr) (paddrs map[
 	paddrs = make(map[QualifiedPhysicalAddr]struct{})
 	maxlen = chunk.Size - offsetWithinChunk
 	for _, stripe := range chunk.PAddrs {
-		paddrs[QualifiedPhysicalAddr{
-			Dev:  stripe.Dev,
-			Addr: stripe.Addr.Add(offsetWithinChunk),
-		}] = struct{}{}
+		paddrs[stripe.Add(offsetWithinChunk)] = struct{}{}
 	}
 
 	return paddrs, maxlen
-- 
cgit v1.2.3-2-g168b