use internal.Generation for generation fiels

6 files changed, 30 insertions, 29 deletions

diff --git a/pkg/btrfs/btrfsitem/item_extent.go b/pkg/btrfs/btrfsitem/item_extent.go
index a86c2bd..778b67f 100644
--- a/pkg/btrfs/btrfsitem/item_extent.go
+++ b/pkg/btrfs/btrfsitem/item_extent.go
@@ -62,9 +62,9 @@ func (o Extent) MarshalBinary() ([]byte, error) {
 }
 
 type ExtentHeader struct {
-	Refs          int64       `bin:"off=0, siz=8"`
-	Generation    int64       `bin:"off=8, siz=8"`
-	Flags         ExtentFlags `bin:"off=16, siz=8"`
+	Refs          int64               `bin:"off=0, siz=8"`
+	Generation    internal.Generation `bin:"off=8, siz=8"`
+	Flags         ExtentFlags         `bin:"off=16, siz=8"`
 	binstruct.End `bin:"off=24"`
 }
 
diff --git a/pkg/btrfs/btrfsitem/item_fileextent.go b/pkg/btrfs/btrfsitem/item_fileextent.go
index 0f7fab4..5e87021 100644
--- a/pkg/btrfs/btrfsitem/item_fileextent.go
+++ b/pkg/btrfs/btrfsitem/item_fileextent.go
@@ -4,11 +4,12 @@ import (
 	"fmt"
 
 	"lukeshu.com/btrfs-tools/pkg/binstruct"
+	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
 )
 
 type FileExtent struct { // EXTENT_DATA=108
-	Generation int64 `bin:"off=0x0, siz=0x8"` // transaction ID that created this extent
-	RAMBytes   int64 `bin:"off=0x8, siz=0x8"` // upper bound of what compressed data will decompress to
+	Generation internal.Generation `bin:"off=0x0, siz=0x8"` // transaction ID that created this extent
+	RAMBytes   int64               `bin:"off=0x8, siz=0x8"` // upper bound of what compressed data will decompress to
 
 	// 32 bits describing the data encoding
 	Compression   CompressionType `bin:"off=0x10, siz=0x1"`
diff --git a/pkg/btrfs/btrfsitem/item_inode.go b/pkg/btrfs/btrfsitem/item_inode.go
index 81ed658..3b7d577 100644
--- a/pkg/btrfs/btrfsitem/item_inode.go
+++ b/pkg/btrfs/btrfsitem/item_inode.go
@@ -7,23 +7,23 @@ import (
 )
 
 type Inode struct { // INODE_ITEM=1
-	Generation    int64         `bin:"off=0x0, siz=0x8"`
-	TransID       int64         `bin:"off=0x8, siz=0x8"`
-	Size          int64         `bin:"off=0x10, siz=0x8"`
-	NumBytes      int64         `bin:"off=0x18, siz=0x8"`
-	BlockGroup    int64         `bin:"off=0x20, siz=0x8"`
-	NLink         int32         `bin:"off=0x28, siz=0x4"`
-	UID           int32         `bin:"off=0x2C, siz=0x4"`
-	GID           int32         `bin:"off=0x30, siz=0x4"`
-	Mode          int32         `bin:"off=0x34, siz=0x4"`
-	RDev          int64         `bin:"off=0x38, siz=0x8"`
-	Flags         InodeFlags    `bin:"off=0x40, siz=0x8"`
-	Sequence      int64         `bin:"off=0x48, siz=0x8"`
-	Reserved      [4]int64      `bin:"off=0x50, siz=0x20"`
-	ATime         internal.Time `bin:"off=0x70, siz=0xc"`
-	CTime         internal.Time `bin:"off=0x7c, siz=0xc"`
-	MTime         internal.Time `bin:"off=0x88, siz=0xc"`
-	OTime         internal.Time `bin:"off=0x94, siz=0xc"`
+	Generation    internal.Generation `bin:"off=0x0, siz=0x8"`
+	TransID       int64               `bin:"off=0x8, siz=0x8"`
+	Size          int64               `bin:"off=0x10, siz=0x8"`
+	NumBytes      int64               `bin:"off=0x18, siz=0x8"`
+	BlockGroup    int64               `bin:"off=0x20, siz=0x8"`
+	NLink         int32               `bin:"off=0x28, siz=0x4"`
+	UID           int32               `bin:"off=0x2C, siz=0x4"`
+	GID           int32               `bin:"off=0x30, siz=0x4"`
+	Mode          int32               `bin:"off=0x34, siz=0x4"`
+	RDev          int64               `bin:"off=0x38, siz=0x8"`
+	Flags         InodeFlags          `bin:"off=0x40, siz=0x8"`
+	Sequence      int64               `bin:"off=0x48, siz=0x8"`
+	Reserved      [4]int64            `bin:"off=0x50, siz=0x20"`
+	ATime         internal.Time       `bin:"off=0x70, siz=0xc"`
+	CTime         internal.Time       `bin:"off=0x7c, siz=0xc"`
+	MTime         internal.Time       `bin:"off=0x88, siz=0xc"`
+	OTime         internal.Time       `bin:"off=0x94, siz=0xc"`
 	binstruct.End `bin:"off=0xa0"`
 }
 
diff --git a/pkg/btrfs/btrfsitem/item_root.go b/pkg/btrfs/btrfsitem/item_root.go
index 86fdabe..f0a961b 100644
--- a/pkg/btrfs/btrfsitem/item_root.go
+++ b/pkg/btrfs/btrfsitem/item_root.go
@@ -8,7 +8,7 @@ import (
 
 type Root struct { // ROOT_ITEM=132
 	Inode         Inode                `bin:"off=0x0, siz=0xa0"`
-	Generation    int64                `bin:"off=0xa0, siz=0x8"`
+	Generation    internal.Generation  `bin:"off=0xa0, siz=0x8"`
 	RootDirID     int64                `bin:"off=0xa8, siz=0x8"`
 	ByteNr        internal.LogicalAddr `bin:"off=0xb0, siz=0x8"`
 	ByteLimit     int64                `bin:"off=0xb8, siz=0x8"`
@@ -19,7 +19,7 @@ type Root struct { // ROOT_ITEM=132
 	DropProgress  internal.Key         `bin:"off=0xdc, siz=0x11"`
 	DropLevel     uint8                `bin:"off=0xed, siz=0x1"`
 	Level         uint8                `bin:"off=0xee, siz=0x1"`
-	GenerationV2  int64                `bin:"off=0xef, siz=0x8"`
+	GenerationV2  internal.Generation  `bin:"off=0xef, siz=0x8"`
 	UUID          internal.UUID        `bin:"off=0xF7, siz=0x10"`
 	ParentUUID    internal.UUID        `bin:"off=0x107, siz=0x10"`
 	ReceivedUUID  internal.UUID        `bin:"off=0x117, siz=0x10"`
diff --git a/pkg/btrfs/btrfsitem/item_untyped.go b/pkg/btrfs/btrfsitem/item_untyped.go
index 51d0676..f5348e1 100644
--- a/pkg/btrfs/btrfsitem/item_untyped.go
+++ b/pkg/btrfs/btrfsitem/item_untyped.go
@@ -6,9 +6,9 @@ import (
 )
 
 type FreeSpaceHeader struct { // UNTYPED=0:FREE_SPACE_OBJECTID
-	Location      internal.Key `bin:"off=0x00, siz=0x11"`
-	Generation    int64        `bin:"off=0x11, siz=0x8"`
-	NumEntries    int64        `bin:"off=0x19, siz=0x8"`
-	NumBitmaps    int64        `bin:"off=0x21, siz=0x8"`
+	Location      internal.Key        `bin:"off=0x00, siz=0x11"`
+	Generation    internal.Generation `bin:"off=0x11, siz=0x8"`
+	NumEntries    int64               `bin:"off=0x19, siz=0x8"`
+	NumBitmaps    int64               `bin:"off=0x21, siz=0x8"`
 	binstruct.End `bin:"off=0x29"`
 }
diff --git a/pkg/btrfs/types_superblock.go b/pkg/btrfs/types_superblock.go
index 9cd097b..7291869 100644
--- a/pkg/btrfs/types_superblock.go
+++ b/pkg/btrfs/types_superblock.go
@@ -46,7 +46,7 @@ type Superblock struct {
 	DevItem            btrfsitem.Dev `bin:"off=0xc9,  siz=0x62"`  // DEV_ITEM data for this device
 	Label              [0x100]byte   `bin:"off=0x12b, siz=0x100"` // label (may not contain '/' or '\\')
 	CacheGeneration    Generation    `bin:"off=0x22b, siz=0x8"`
-	UUIDTreeGeneration uint64        `bin:"off=0x233, siz=0x8"` // uuid_tree_generation
+	UUIDTreeGeneration Generation    `bin:"off=0x233, siz=0x8"`
 
 	// FeatureIncompatMetadataUUID
 	MetadataUUID UUID `bin:"off=0x23b, siz=0x10"`