wip gather stripes

3 files changed, 15 insertions, 11 deletions

diff --git a/pkg/btrfs/btrfsitem/item_chunk.go b/pkg/btrfs/btrfsitem/item_chunk.go
index 4389a46..8ffc83b 100644
--- a/pkg/btrfs/btrfsitem/item_chunk.go
+++ b/pkg/btrfs/btrfsitem/item_chunk.go
@@ -7,8 +7,13 @@ import (
 	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
 )
 
+// Maps logical address to physical.
 type Chunk struct { // CHUNK_ITEM=228
-	// Maps logical address to physical.
+	Head    ChunkHeader
+	Stripes []ChunkStripe
+}
+
+type ChunkHeader struct {
 	Size           uint64          `bin:"off=0x0,  siz=0x8"` // size of chunk (bytes)
 	Owner          internal.ObjID  `bin:"off=0x8,  siz=0x8"` // root referencing this chunk (2)
 	StripeLen      uint64          `bin:"off=0x10, siz=0x8"` // stripe length
@@ -19,7 +24,6 @@ type Chunk struct { // CHUNK_ITEM=228
 	NumStripes     uint16          `bin:"off=0x2c, siz=0x2"` // number of stripes
 	SubStripes     uint16          `bin:"off=0x2e, siz=0x2"` // sub stripes
 	binstruct.End  `bin:"off=0x30"`
-	Stripes        []ChunkStripe `bin:"-"`
 }
 
 type ChunkStripe struct {
@@ -30,12 +34,12 @@ type ChunkStripe struct {
 }
 
 func (chunk *Chunk) UnmarshalBinary(dat []byte) (int, error) {
-	n, err := binstruct.UnmarshalWithoutInterface(dat, chunk)
+	n, err := binstruct.Unmarshal(dat, &chunk.Head)
 	if err != nil {
 		return n, err
 	}
 	chunk.Stripes = nil
-	for i := 0; i < int(chunk.NumStripes); i++ {
+	for i := 0; i < int(chunk.Head.NumStripes); i++ {
 		var stripe ChunkStripe
 		_n, err := binstruct.Unmarshal(dat[n:], &stripe)
 		n += _n
@@ -48,8 +52,8 @@ func (chunk *Chunk) UnmarshalBinary(dat []byte) (int, error) {
 }
 
 func (chunk Chunk) MarshalBinary() ([]byte, error) {
-	chunk.NumStripes = uint16(len(chunk.Stripes))
-	ret, err := binstruct.MarshalWithoutInterface(chunk)
+	chunk.Head.NumStripes = uint16(len(chunk.Stripes))
+	ret, err := binstruct.Marshal(chunk.Head)
 	if err != nil {
 		return ret, err
 	}
diff --git a/pkg/btrfs/io2_fs.go b/pkg/btrfs/io2_fs.go
index ca67a9c..035019c 100644
--- a/pkg/btrfs/io2_fs.go
+++ b/pkg/btrfs/io2_fs.go
@@ -175,9 +175,9 @@ func (fs *FS) Resolve(laddr LogicalAddr) (paddrs map[QualifiedPhysicalAddr]struc
 	maxlen = math.MaxUint64
 
 	for _, chunk := range fs.chunks {
-		if chunk.Key.Offset <= uint64(laddr) && uint64(laddr) < chunk.Key.Offset+uint64(chunk.Chunk.Size) {
+		if chunk.Key.Offset <= uint64(laddr) && uint64(laddr) < chunk.Key.Offset+uint64(chunk.Chunk.Head.Size) {
 			offsetWithinChunk := uint64(laddr) - chunk.Key.Offset
-			maxlen = util.Min(maxlen, chunk.Chunk.Size-offsetWithinChunk)
+			maxlen = util.Min(maxlen, chunk.Chunk.Head.Size-offsetWithinChunk)
 			for _, stripe := range chunk.Chunk.Stripes {
 				paddrs[QualifiedPhysicalAddr{
 					Dev:  stripe.DeviceUUID,
diff --git a/pkg/btrfsmisc/print_tree.go b/pkg/btrfsmisc/print_tree.go
index a771b65..3211d1d 100644
--- a/pkg/btrfsmisc/print_tree.go
+++ b/pkg/btrfsmisc/print_tree.go
@@ -159,11 +159,11 @@ func PrintTree(fs *btrfs.FS, root btrfs.LogicalAddr) error {
 				fmt.Printf("\t\tfree space bitmap\n")
 			case btrfsitem.Chunk:
 				fmt.Printf("\t\tlength %d owner %d stripe_len %d type %v\n",
-					body.Size, body.Owner, body.StripeLen, body.Type)
+					body.Head.Size, body.Head.Owner, body.Head.StripeLen, body.Head.Type)
 				fmt.Printf("\t\tio_align %d io_width %d sector_size %d\n",
-					body.IOOptimalAlign, body.IOOptimalWidth, body.IOMinSize)
+					body.Head.IOOptimalAlign, body.Head.IOOptimalWidth, body.Head.IOMinSize)
 				fmt.Printf("\t\tnum_stripes %d sub_stripes %d\n",
-					body.NumStripes, body.SubStripes)
+					body.Head.NumStripes, body.Head.SubStripes)
 				for i, stripe := range body.Stripes {
 					fmt.Printf("\t\t\tstripe %d devid %d offset %d\n",
 						i, stripe.DeviceID, stripe.Offset)