diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2022-07-01 21:48:56 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2022-07-01 21:48:56 -0600 |
| commit | 22c72e497425dd24695f5ee8f883c977c7e38db6 (patch) | |
| tree | 2cc2546a56ba3d2ad50f8b4309f19f173549eb2a /cmd/btrfs-fsck | |
| parent | 46c859edf45784ce099434bd967b352165801c85 (diff) | |
rename WalkTree→TreeWalk
Diffstat (limited to 'cmd/btrfs-fsck')
| -rw-r--r-- | cmd/btrfs-fsck/pass1.go | 4 | ||||
| -rw-r--r-- | cmd/btrfs-fsck/pass2.go | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cmd/btrfs-fsck/pass1.go b/cmd/btrfs-fsck/pass1.go index 5188d65..36bc1ae 100644 --- a/cmd/btrfs-fsck/pass1.go +++ b/cmd/btrfs-fsck/pass1.go @@ -23,8 +23,8 @@ func pass1(fs *btrfs.FS, superblock *util.Ref[btrfs.PhysicalAddr, btrfs.Superblo fmt.Printf("Pass 1: ... walking fs\n") visitedNodes := make(map[btrfs.LogicalAddr]struct{}) btrfsmisc.WalkFS(fs, btrfsmisc.WalkFSHandler{ - WalkTreeHandler: btrfs.WalkTreeHandler{ - Node: func(path btrfs.WalkTreePath, node *util.Ref[btrfs.LogicalAddr, btrfs.Node], err error) error { + TreeWalkHandler: btrfs.TreeWalkHandler{ + Node: func(path btrfs.TreeWalkPath, node *util.Ref[btrfs.LogicalAddr, btrfs.Node], err error) error { if err != nil { err = fmt.Errorf("%v: %w", path, err) fmt.Printf("Pass 1: ... walk fs: error: %v\n", err) diff --git a/cmd/btrfs-fsck/pass2.go b/cmd/btrfs-fsck/pass2.go index 7970cca..bcc57a5 100644 --- a/cmd/btrfs-fsck/pass2.go +++ b/cmd/btrfs-fsck/pass2.go @@ -14,8 +14,8 @@ func pass2(fs *btrfs.FS, foundNodes map[btrfs.LogicalAddr]struct{}) { visitedNodes := make(map[btrfs.LogicalAddr]struct{}) btrfsmisc.WalkFS(fs, btrfsmisc.WalkFSHandler{ - WalkTreeHandler: btrfs.WalkTreeHandler{ - Node: func(path btrfs.WalkTreePath, node *util.Ref[btrfs.LogicalAddr, btrfs.Node], err error) error { + TreeWalkHandler: btrfs.TreeWalkHandler{ + Node: func(path btrfs.TreeWalkPath, node *util.Ref[btrfs.LogicalAddr, btrfs.Node], err error) error { visitedNodes[node.Addr] = struct{}{} return nil }, @@ -37,8 +37,8 @@ func pass2(fs *btrfs.FS, foundNodes map[btrfs.LogicalAddr]struct{}) { orphanedRoots[node] = struct{}{} } for potentialRoot := range orphanedRoots { - if err := fs.WalkTree(potentialRoot, btrfs.WalkTreeHandler{ - Node: func(path btrfs.WalkTreePath, _ *util.Ref[btrfs.LogicalAddr, btrfs.Node], _ error) error { + if err := fs.TreeWalk(potentialRoot, btrfs.TreeWalkHandler{ + Node: func(path btrfs.TreeWalkPath, _ *util.Ref[btrfs.LogicalAddr, btrfs.Node], _ error) error { nodeAddr := path[len(path)-1].NodeAddr if nodeAddr != potentialRoot { delete(orphanedRoots, nodeAddr) |