From 8db7bed06505569c1b41a338b5131cfd5c9d1f28 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Sun, 26 Jun 2022 20:25:27 -0600
Subject: tidy up which package things are in

---
 pkg/btrfs/btrfsitem/item_blockgroup.go | 54 +++-------------------------------
 1 file changed, 4 insertions(+), 50 deletions(-)

(limited to 'pkg/btrfs/btrfsitem/item_blockgroup.go')

diff --git a/pkg/btrfs/btrfsitem/item_blockgroup.go b/pkg/btrfs/btrfsitem/item_blockgroup.go
index 737cfa0..8f7847d 100644
--- a/pkg/btrfs/btrfsitem/item_blockgroup.go
+++ b/pkg/btrfs/btrfsitem/item_blockgroup.go
@@ -2,61 +2,15 @@ package btrfsitem
 
 import (
 	"lukeshu.com/btrfs-tools/pkg/binstruct"
+	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
 	"lukeshu.com/btrfs-tools/pkg/btrfs/internal"
-	"lukeshu.com/btrfs-tools/pkg/util"
 )
 
 // key.objectid = logical_addr
 // key.offset = size of chunk
 type BlockGroup struct { // BLOCK_GROUP_ITEM=192
-	Used          int64           `bin:"off=0, siz=8"`
-	ChunkObjectID internal.ObjID  `bin:"off=8, siz=8"`
-	Flags         BlockGroupFlags `bin:"off=16, siz=8"`
+	Used          int64                    `bin:"off=0, siz=8"`
+	ChunkObjectID internal.ObjID           `bin:"off=8, siz=8"`
+	Flags         btrfsvol.BlockGroupFlags `bin:"off=16, siz=8"`
 	binstruct.End `bin:"off=24"`
 }
-
-type BlockGroupFlags uint64
-
-const (
-	BLOCK_GROUP_DATA = BlockGroupFlags(1 << iota)
-	BLOCK_GROUP_SYSTEM
-	BLOCK_GROUP_METADATA
-	BLOCK_GROUP_RAID0
-	BLOCK_GROUP_RAID1
-	BLOCK_GROUP_DUP
-	BLOCK_GROUP_RAID10
-	BLOCK_GROUP_RAID5
-	BLOCK_GROUP_RAID6
-	BLOCK_GROUP_RAID1C3
-	BLOCK_GROUP_RAID1C4
-
-	BLOCK_GROUP_RAID_MASK = (BLOCK_GROUP_RAID1 | BLOCK_GROUP_DUP | BLOCK_GROUP_RAID10 | BLOCK_GROUP_RAID5 | BLOCK_GROUP_RAID6 | BLOCK_GROUP_RAID1C3 | BLOCK_GROUP_RAID1C4)
-)
-
-var blockGroupFlagNames = []string{
-	"DATA",
-	"SYSTEM",
-	"METADATA",
-
-	"RAID0",
-	"RAID1",
-	"DUP",
-	"RAID10",
-	"RAID5",
-	"RAID6",
-	"RAID1C3",
-	"RAID1C4",
-}
-
-func (f BlockGroupFlags) Has(req BlockGroupFlags) bool { return f&req == req }
-func (f BlockGroupFlags) String() string {
-	ret := util.BitfieldString(f, blockGroupFlagNames, util.HexNone)
-	if f&BLOCK_GROUP_RAID_MASK == 0 {
-		if ret == "" {
-			ret = "single"
-		} else {
-			ret += "|single"
-		}
-	}
-	return ret
-}
-- 
cgit v1.2.3-2-g168b