fuss with exposing .LV and how init happens

3 files changed, 31 insertions, 30 deletions

diff --git a/cmd/btrfs-fsck/main.go b/cmd/btrfs-fsck/main.go
index 0083bd9..e51aae9 100644
--- a/cmd/btrfs-fsck/main.go
+++ b/cmd/btrfs-fsck/main.go
@@ -3,43 +3,40 @@ package main
 import (
 	"fmt"
 	"os"
-
-	"lukeshu.com/btrfs-tools/pkg/btrfs"
 )
 
 func main() {
-	if err := Main(os.Args[1]); err != nil {
+	if err := Main(os.Args[1:]...); err != nil {
 		fmt.Fprintf(os.Stderr, "%v: error: %v\n", os.Args[0], err)
 		os.Exit(1)
 	}
 }
 
-func Main(imgfilename string) (err error) {
+func Main(imgfilenames ...string) (err error) {
 	maybeSetErr := func(_err error) {
 		if _err != nil && err == nil {
 			err = _err
 		}
 	}
 
-	fh, err := os.OpenFile(imgfilename, os.O_RDWR, 0)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		maybeSetErr(fh.Close())
-	}()
-
-	fs := new(btrfs.FS)
-	if err := fs.AddDevice(&btrfs.Device{File: fh}); err != nil {
-		return err
+	var imgfiles []*os.File
+	for _, imgfilename := range imgfilenames {
+		fh, err := os.OpenFile(imgfilename, os.O_RDWR, 0)
+		if err != nil {
+			return err
+		}
+		defer func() {
+			maybeSetErr(fh.Close())
+		}()
+		imgfiles = append(imgfiles, fh)
 	}
 
-	superblock, err := pass0(fs)
+	fs, sb, err := pass0(imgfiles...)
 	if err != nil {
 		return err
 	}
 
-	foundNodes, err := pass1(fs, superblock)
+	foundNodes, err := pass1(fs, sb)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/btrfs-fsck/pass0.go b/cmd/btrfs-fsck/pass0.go
index 8482826..2a8e20a 100644
--- a/cmd/btrfs-fsck/pass0.go
+++ b/cmd/btrfs-fsck/pass0.go
@@ -2,18 +2,27 @@ package main
 
 import (
 	"fmt"
+	"os"
 
 	"lukeshu.com/btrfs-tools/pkg/btrfs"
 	"lukeshu.com/btrfs-tools/pkg/util"
 )
 
-func pass0(fs *btrfs.FS) (*util.Ref[btrfs.PhysicalAddr, btrfs.Superblock], error) {
-	fmt.Printf("\nPass 0: superblocks...\n")
+func pass0(imgfiles ...*os.File) (*btrfs.FS, *util.Ref[btrfs.PhysicalAddr, btrfs.Superblock], error) {
+	fmt.Printf("\nPass 0: init and superblocks...\n")
 
-	superblock, err := fs.Superblock()
+	fs := new(btrfs.FS)
+	for _, imgfile := range imgfiles {
+		fmt.Printf("Pass 0: ... adding device %q...\n", imgfile.Name())
+		if err := fs.AddDevice(&btrfs.Device{File: imgfile}); err != nil {
+			fmt.Printf("Pass 0: ... add device %q: error: %v\n", imgfile.Name(), err)
+		}
+	}
+
+	sb, err := fs.Superblock()
 	if err != nil {
-		return nil, fmt.Errorf("superblock: %w", err)
+		return nil, nil, err
 	}
 
-	return superblock, nil
+	return fs, sb, nil
 }
diff --git a/cmd/btrfs-fsck/pass1.go b/cmd/btrfs-fsck/pass1.go
index 7798650..aada80d 100644
--- a/cmd/btrfs-fsck/pass1.go
+++ b/cmd/btrfs-fsck/pass1.go
@@ -18,11 +18,6 @@ import (
 func pass1(fs *btrfs.FS, superblock *util.Ref[btrfs.PhysicalAddr, btrfs.Superblock]) (map[btrfs.LogicalAddr]struct{}, error) {
 	fmt.Printf("\nPass 1: chunk mappings...\n")
 
-	fmt.Printf("Pass 1: ... initializing chunk mappings\n")
-	if err := fs.Init(); err != nil {
-		fmt.Printf("Pass 1: ... init chunk tree: error: %v\n", err)
-	}
-
 	fmt.Printf("Pass 1: ... walking fs\n")
 	visitedNodes := make(map[btrfs.LogicalAddr]struct{})
 	btrfsmisc.WalkFS(fs, btrfs.WalkTreeHandler{
@@ -45,7 +40,7 @@ func pass1(fs *btrfs.FS, superblock *util.Ref[btrfs.PhysicalAddr, btrfs.Superblo
 		Size    btrfs.AddrDelta
 		Stripes []btrfsitem.ChunkStripe
 	})
-	for _, dev := range fs.Devices() {
+	for _, dev := range fs.LV.PhysicalVolumes() {
 		fmt.Printf("Pass 1: ... dev[%q] scanning for nodes...\n", dev.Name())
 		devResult, err := pass1ScanOneDev(dev, superblock.Data)
 		if err != nil {
@@ -506,7 +501,7 @@ func pass1WriteReconstructedChunks(
 		},
 	}
 
-	for _, dev := range fs.Devices() {
+	for _, dev := range fs.LV.PhysicalVolumes() {
 		superblock, _ := dev.Superblock()
 		reconstructedNode.Data.BodyLeaf = append(reconstructedNode.Data.BodyLeaf, btrfs.Item{
 			Head: btrfs.ItemHeader{
@@ -568,7 +563,7 @@ func pass1WriteReconstructedChunks(
 		fmt.Printf("Pass 1: ... write new node: error: %v\n", err)
 	}
 
-	if err := fs.Init(); err != nil {
+	if err := fs.ReInit(); err != nil {
 		fmt.Printf("Pass 1: ... re-init mappings: %v\n", err)
 	}
 }