From 28549f676e040c96bfae575535dea7e0ecdf0f41 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Sat, 11 Feb 2023 22:15:41 -0700
Subject: Change how constants are declared to play nice with godoc

Switch to

   NAME Type = val

instead of

   NAME = Type(val)
---
 lib/btrfs/btrfstree/types_node.go       | 6 +++---
 lib/btrfs/btrfstree/types_superblock.go | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/btrfs/btrfstree')

diff --git a/lib/btrfs/btrfstree/types_node.go b/lib/btrfs/btrfstree/types_node.go
index fd4c939..0a89e05 100644
--- a/lib/btrfs/btrfstree/types_node.go
+++ b/lib/btrfs/btrfstree/types_node.go
@@ -58,7 +58,7 @@ var (
 )
 
 const (
-	NodeWritten = NodeFlags(1 << iota)
+	NodeWritten NodeFlags = 1 << iota
 	NodeReloc
 )
 
@@ -73,8 +73,8 @@ func (f NodeFlags) String() string         { return fmtutil.BitfieldString(f, no
 type BackrefRev uint8
 
 const (
-	OldBackrefRev   = BackrefRev(iota)
-	MixedBackrefRev = BackrefRev(iota)
+	OldBackrefRev BackrefRev = iota
+	MixedBackrefRev
 )
 
 // Node: main //////////////////////////////////////////////////////////////////////////////////////
diff --git a/lib/btrfs/btrfstree/types_superblock.go b/lib/btrfs/btrfstree/types_superblock.go
index 140d4a1..a9b1633 100644
--- a/lib/btrfs/btrfstree/types_superblock.go
+++ b/lib/btrfs/btrfstree/types_superblock.go
@@ -199,7 +199,7 @@ type RootBackup struct {
 type IncompatFlags uint64
 
 const (
-	FeatureIncompatMixedBackref = IncompatFlags(1 << iota)
+	FeatureIncompatMixedBackref IncompatFlags = 1 << iota
 	FeatureIncompatDefaultSubvol
 	FeatureIncompatMixedGroups
 	FeatureIncompatCompressLZO
-- 
cgit v1.2.3-2-g168b


From 1f3a1a474ac41f427e4c5b0d27d2c85a3cfaa65e Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Sat, 11 Feb 2023 22:40:40 -0700
Subject: btrfsprim: Have ObjID.Format() take the tree ID, not the item type

---
 lib/btrfs/btrfstree/path.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib/btrfs/btrfstree')

diff --git a/lib/btrfs/btrfstree/path.go b/lib/btrfs/btrfstree/path.go
index d9bf216..dd2cb74 100644
--- a/lib/btrfs/btrfstree/path.go
+++ b/lib/btrfs/btrfstree/path.go
@@ -9,7 +9,6 @@ import (
 	"io"
 	"strings"
 
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsprim"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
 )
@@ -104,7 +103,7 @@ func (path TreePath) String() string {
 		return "(empty-path)"
 	} else {
 		var ret strings.Builder
-		fmt.Fprintf(&ret, "%s->", path[0].FromTree.Format(btrfsitem.ROOT_ITEM_KEY))
+		fmt.Fprintf(&ret, "%s->", path[0].FromTree.Format(btrfsprim.ROOT_TREE_OBJECTID))
 		if len(path) == 1 && path[0] == (TreePathElem{FromTree: path[0].FromTree, FromItemIdx: -1}) {
 			ret.WriteString("(empty-path)")
 		} else {
-- 
cgit v1.2.3-2-g168b