From 1624c2ef8c5f95e428ad185278c3cba576f9dcb0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 22 Jul 2023 21:18:40 -0600 Subject: btrfs: Export SuperBlockSize --- lib/btrfs/io1_pv.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/btrfs') diff --git a/lib/btrfs/io1_pv.go b/lib/btrfs/io1_pv.go index 3b13f73..46eb24d 100644 --- a/lib/btrfs/io1_pv.go +++ b/lib/btrfs/io1_pv.go @@ -30,19 +30,18 @@ var SuperblockAddrs = []btrfsvol.PhysicalAddr{ 0x40_0000_0000, // 256GiB } -var superblockSize = binstruct.StaticSize(btrfstree.Superblock{}) +var SuperblockSize = btrfsvol.PhysicalAddr(binstruct.StaticSize(btrfstree.Superblock{})) func (dev *Device) Superblocks() ([]*diskio.Ref[btrfsvol.PhysicalAddr, btrfstree.Superblock], error) { if dev.cacheSuperblocks != nil { return dev.cacheSuperblocks, nil } - superblockSize := btrfsvol.PhysicalAddr(superblockSize) sz := dev.Size() var ret []*diskio.Ref[btrfsvol.PhysicalAddr, btrfstree.Superblock] for i, addr := range SuperblockAddrs { - if addr+superblockSize <= sz { + if addr+SuperblockSize <= sz { superblock := &diskio.Ref[btrfsvol.PhysicalAddr, btrfstree.Superblock]{ File: dev, Addr: addr, -- cgit v1.2.3-2-g168b From a2e7457d7fc339caac4e1f55d0eeadd732af60b1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 25 Jul 2023 12:31:30 -0600 Subject: Don't try to read the chunk tree until all devices are added --- lib/btrfs/io2_lv.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'lib/btrfs') diff --git a/lib/btrfs/io2_lv.go b/lib/btrfs/io2_lv.go index e9de215..16c5987 100644 --- a/lib/btrfs/io2_lv.go +++ b/lib/btrfs/io2_lv.go @@ -43,7 +43,7 @@ func (fs *FS) AddDevice(ctx context.Context, dev *Device) error { } fs.cacheSuperblocks = nil fs.cacheSuperblock = nil - if err := fs.initDev(ctx, *sb); err != nil { + if err := fs.initDev(*sb); err != nil { dlog.Errorf(ctx, "error: AddDevice: %q: %v", dev.Name(), err) } return nil @@ -142,14 +142,14 @@ func (fs *FS) ReInit(ctx context.Context) error { if err != nil { return fmt.Errorf("file %q: %w", dev.Name(), err) } - if err := fs.initDev(ctx, *sb); err != nil { + if err := fs.initDev(*sb); err != nil { return fmt.Errorf("file %q: %w", dev.Name(), err) } } - return nil + return fs.InitChunks(ctx) } -func (fs *FS) initDev(ctx context.Context, sb btrfstree.Superblock) error { +func (fs *FS) initDev(sb btrfstree.Superblock) error { syschunks, err := sb.ParseSysChunkArray() if err != nil { return err @@ -161,6 +161,10 @@ func (fs *FS) initDev(ctx context.Context, sb btrfstree.Superblock) error { } } } + return nil +} + +func (fs *FS) InitChunks(ctx context.Context) error { chunkTree, err := fs.ForrestLookup(ctx, btrfsprim.CHUNK_TREE_OBJECTID) if err != nil { return err -- cgit v1.2.3-2-g168b