summaryrefslogtreecommitdiff
path: root/cmd/btrfs-fsck/pass1.go
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2022-07-13 00:36:34 -0600
committerLuke Shumaker <lukeshu@lukeshu.com>2022-07-13 00:36:34 -0600
commit7df18a02a988086d940a011eafeb1b8d70775005 (patch)
treed0d3c39fa5d12dc5fcc8de2381b47667bc3cdbc0 /cmd/btrfs-fsck/pass1.go
parentf1e8040bc33e9057bd7a756a09c431c3f0d86226 (diff)
Have TreeWalk be cancelable
Diffstat (limited to 'cmd/btrfs-fsck/pass1.go')
-rw-r--r--cmd/btrfs-fsck/pass1.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/btrfs-fsck/pass1.go b/cmd/btrfs-fsck/pass1.go
index e41694a..a625193 100644
--- a/cmd/btrfs-fsck/pass1.go
+++ b/cmd/btrfs-fsck/pass1.go
@@ -22,7 +22,7 @@ func pass1(ctx context.Context, fs *btrfs.FS, superblock *btrfs.Superblock) (map
fmt.Printf("Pass 1: ... walking fs\n")
visitedNodes := make(map[btrfsvol.LogicalAddr]struct{})
- btrfsutil.WalkAllTrees(fs, btrfsutil.WalkAllTreesHandler{
+ btrfsutil.WalkAllTrees(ctx, fs, btrfsutil.WalkAllTreesHandler{
TreeWalkHandler: btrfs.TreeWalkHandler{
Node: func(path btrfs.TreePath, node *util.Ref[btrfsvol.LogicalAddr, btrfs.Node]) error {
visitedNodes[node.Addr] = struct{}{}
@@ -57,12 +57,12 @@ func pass1(ctx context.Context, fs *btrfs.FS, superblock *btrfs.Superblock) (map
btrfsinspect.PrintPhysicalSpace(os.Stdout, fs)
fmt.Printf("Pass 1: ... writing re-constructed chunks\n")
- pass1WriteReconstructedChunks(fs)
+ pass1WriteReconstructedChunks(ctx, fs)
return fsFoundNodes, nil
}
-func pass1WriteReconstructedChunks(fs *btrfs.FS) {
+func pass1WriteReconstructedChunks(ctx context.Context, fs *btrfs.FS) {
superblock, _ := fs.Superblock()
// FIXME(lukeshu): OK, so this just assumes that all the
@@ -145,7 +145,7 @@ func pass1WriteReconstructedChunks(fs *btrfs.FS) {
fmt.Printf("Pass 1: ... write new node: error: %v\n", err)
}
- if err := fs.ReInit(); err != nil {
+ if err := fs.ReInit(ctx); err != nil {
fmt.Printf("Pass 1: ... re-init mappings: %v\n", err)
}