diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2022-07-01 23:07:21 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2022-07-01 23:09:19 -0600 |
| commit | 2202cfba154b69a947ae45629ef8105de7f63ac4 (patch) | |
| tree | af6fbe8c84b59b709bfbbb82d1c14c35ac0e3748 /cmd | |
| parent | f1bc48ee12c6873b6b57a2403325765e987ad813 (diff) | |
Rename TreeWalkPath→TreePath
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/btrfs-dump-tree/main.go | 2 | ||||
| -rw-r--r-- | cmd/btrfs-fsck/pass1.go | 2 | ||||
| -rw-r--r-- | cmd/btrfs-fsck/pass2.go | 4 | ||||
| -rw-r--r-- | cmd/btrfs-ls-trees/main.go | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/cmd/btrfs-dump-tree/main.go b/cmd/btrfs-dump-tree/main.go index c7e4beb..7f1aba4 100644 --- a/cmd/btrfs-dump-tree/main.go +++ b/cmd/btrfs-dump-tree/main.go @@ -64,7 +64,7 @@ func Main(imgfilename string) (err error) { } } if err := fs.TreeWalk(superblock.Data.RootTree, btrfs.TreeWalkHandler{ - Item: func(_ btrfs.TreeWalkPath, item btrfs.Item) error { + Item: func(_ btrfs.TreePath, item btrfs.Item) error { if item.Head.Key.ItemType != btrfsitem.ROOT_ITEM_KEY { return nil } diff --git a/cmd/btrfs-fsck/pass1.go b/cmd/btrfs-fsck/pass1.go index 36bc1ae..e75e4fe 100644 --- a/cmd/btrfs-fsck/pass1.go +++ b/cmd/btrfs-fsck/pass1.go @@ -24,7 +24,7 @@ func pass1(fs *btrfs.FS, superblock *util.Ref[btrfs.PhysicalAddr, btrfs.Superblo visitedNodes := make(map[btrfs.LogicalAddr]struct{}) btrfsmisc.WalkFS(fs, btrfsmisc.WalkFSHandler{ TreeWalkHandler: btrfs.TreeWalkHandler{ - Node: func(path btrfs.TreeWalkPath, node *util.Ref[btrfs.LogicalAddr, btrfs.Node], err error) error { + Node: func(path btrfs.TreePath, 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 bcc57a5..989b79f 100644 --- a/cmd/btrfs-fsck/pass2.go +++ b/cmd/btrfs-fsck/pass2.go @@ -15,7 +15,7 @@ func pass2(fs *btrfs.FS, foundNodes map[btrfs.LogicalAddr]struct{}) { visitedNodes := make(map[btrfs.LogicalAddr]struct{}) btrfsmisc.WalkFS(fs, btrfsmisc.WalkFSHandler{ TreeWalkHandler: btrfs.TreeWalkHandler{ - Node: func(path btrfs.TreeWalkPath, node *util.Ref[btrfs.LogicalAddr, btrfs.Node], err error) error { + Node: func(path btrfs.TreePath, node *util.Ref[btrfs.LogicalAddr, btrfs.Node], err error) error { visitedNodes[node.Addr] = struct{}{} return nil }, @@ -38,7 +38,7 @@ func pass2(fs *btrfs.FS, foundNodes map[btrfs.LogicalAddr]struct{}) { } for potentialRoot := range orphanedRoots { if err := fs.TreeWalk(potentialRoot, btrfs.TreeWalkHandler{ - Node: func(path btrfs.TreeWalkPath, _ *util.Ref[btrfs.LogicalAddr, btrfs.Node], _ error) error { + Node: func(path btrfs.TreePath, _ *util.Ref[btrfs.LogicalAddr, btrfs.Node], _ error) error { nodeAddr := path[len(path)-1].NodeAddr if nodeAddr != potentialRoot { delete(orphanedRoots, nodeAddr) diff --git a/cmd/btrfs-ls-trees/main.go b/cmd/btrfs-ls-trees/main.go index 96638ed..395ef07 100644 --- a/cmd/btrfs-ls-trees/main.go +++ b/cmd/btrfs-ls-trees/main.go @@ -46,7 +46,7 @@ func Main(imgfilenames ...string) (err error) { treeErrCnt++ }, TreeWalkHandler: btrfs.TreeWalkHandler{ - Item: func(_ btrfs.TreeWalkPath, item btrfs.Item) error { + Item: func(_ btrfs.TreePath, item btrfs.Item) error { typ := item.Head.Key.ItemType treeItemCnt[typ] = treeItemCnt[typ] + 1 return nil |