summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/btrfs-dump-tree/main.go4
-rw-r--r--cmd/btrfs-fsck/pass1.go4
-rw-r--r--cmd/btrfs-fsck/pass2.go8
-rw-r--r--cmd/btrfs-ls-trees/main.go4
4 files changed, 10 insertions, 10 deletions
diff --git a/cmd/btrfs-dump-tree/main.go b/cmd/btrfs-dump-tree/main.go
index b226af3..c7e4beb 100644
--- a/cmd/btrfs-dump-tree/main.go
+++ b/cmd/btrfs-dump-tree/main.go
@@ -63,8 +63,8 @@ func Main(imgfilename string) (err error) {
return err
}
}
- if err := fs.WalkTree(superblock.Data.RootTree, btrfs.WalkTreeHandler{
- Item: func(_ btrfs.WalkTreePath, item btrfs.Item) error {
+ if err := fs.TreeWalk(superblock.Data.RootTree, btrfs.TreeWalkHandler{
+ Item: func(_ btrfs.TreeWalkPath, 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 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)
diff --git a/cmd/btrfs-ls-trees/main.go b/cmd/btrfs-ls-trees/main.go
index c3156f5..96638ed 100644
--- a/cmd/btrfs-ls-trees/main.go
+++ b/cmd/btrfs-ls-trees/main.go
@@ -45,8 +45,8 @@ func Main(imgfilenames ...string) (err error) {
Err: func(_ error) {
treeErrCnt++
},
- WalkTreeHandler: btrfs.WalkTreeHandler{
- Item: func(_ btrfs.WalkTreePath, item btrfs.Item) error {
+ TreeWalkHandler: btrfs.TreeWalkHandler{
+ Item: func(_ btrfs.TreeWalkPath, item btrfs.Item) error {
typ := item.Head.Key.ItemType
treeItemCnt[typ] = treeItemCnt[typ] + 1
return nil