summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2023-03-04 11:07:37 -0700
committerLuke Shumaker <lukeshu@lukeshu.com>2023-03-17 22:30:37 -0400
commit8b17537fc562ef422aee7976cf4a44dd040900aa (patch)
treec0cc1c4a87d477e792cc41e987bf044074e3a690 /cmd
parentcd199b402673b154add1e492b8ddfec43309dc5d (diff)
btrfsutil: Merge KeyIO in to RebuiltForrest
Diffstat (limited to 'cmd')
-rw-r--r--cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go10
1 files changed, 3 insertions, 7 deletions
diff --git a/cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go b/cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go
index 4937ee3..01e4e3c 100644
--- a/cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go
+++ b/cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go
@@ -47,8 +47,7 @@ func (o keyAndTree) String() string {
}
type rebuilder struct {
- scan ScanDevicesResult
- keyIO *btrfsutil.KeyIO
+ scan ScanDevicesResult
rebuilt *btrfsutil.RebuiltForrest
@@ -83,13 +82,10 @@ func NewRebuilder(ctx context.Context, fs *btrfs.FS, nodeList []btrfsvol.Logical
return nil, err
}
- keyIO := btrfsutil.NewKeyIO(fs, scanData.Superblock, scanData.Graph)
-
o := &rebuilder{
- scan: scanData,
- keyIO: keyIO,
+ scan: scanData,
}
- o.rebuilt = btrfsutil.NewRebuiltForrest(scanData.Superblock, scanData.Graph, keyIO, forrestCallbacks{o})
+ o.rebuilt = btrfsutil.NewRebuiltForrest(fs, scanData.Superblock, scanData.Graph, forrestCallbacks{o})
return o, nil
}