btrfsutil: OldRebuiltForrest: Move ReadableFS methods to the end

...and touch up comments.

1 files changed, 17 insertions, 15 deletions

diff --git a/lib/btrfsutil/old_rebuilt_forrest.go b/lib/btrfsutil/old_rebuilt_forrest.go
index 58333df..91fa275 100644
--- a/lib/btrfsutil/old_rebuilt_forrest.go
+++ b/lib/btrfsutil/old_rebuilt_forrest.go
@@ -393,21 +393,6 @@ func (tree oldRebuiltTree) TreeWalk(ctx context.Context, cbs btrfstree.TreeWalkH
 	tree.forrest.inner.ReleaseNode(node)
 }
 
-// Superblock implements btrfs.ReadableFS.
-func (bt *OldRebuiltForrest) Superblock() (*btrfstree.Superblock, error) {
-	return bt.inner.Superblock()
-}
-
-// ReadAt implements diskio.ReaderAt (and btrfs.ReadableFS).
-func (bt *OldRebuiltForrest) ReadAt(p []byte, off btrfsvol.LogicalAddr) (int, error) {
-	return bt.inner.ReadAt(p, off)
-}
-
-// Name implements btrfs.ReadableFS.
-func (bt *OldRebuiltForrest) Name() string {
-	return bt.inner.Name()
-}
-
 // TreeCheckOwner implements btrfstree.Tree.
 func (tree oldRebuiltTree) TreeCheckOwner(ctx context.Context, failOpen bool, owner btrfsprim.ObjID, gen btrfsprim.Generation) error {
 	var uuidTree oldRebuiltTree
@@ -463,3 +448,20 @@ func (tree oldRebuiltTree) TreeCheckOwner(ctx context.Context, failOpen bool, ow
 		}
 	}
 }
+
+// btrfs.ReadableFS (other than btrfstree.Forrest) /////////////////////////////////////////////////////////////////////
+
+// Name implements btrfs.ReadableFS.
+func (bt *OldRebuiltForrest) Name() string {
+	return bt.inner.Name()
+}
+
+// Superblock implements btrfstree.NodeSource (and btrfs.ReadableFS).
+func (bt *OldRebuiltForrest) Superblock() (*btrfstree.Superblock, error) {
+	return bt.inner.Superblock()
+}
+
+// ReadAt implements diskio.ReaderAt[btrfsvol.LogicalAddr] (and btrfs.ReadableFS).
+func (bt *OldRebuiltForrest) ReadAt(p []byte, off btrfsvol.LogicalAddr) (int, error) {
+	return bt.inner.ReadAt(p, off)
+}