Merge branch 'lukeshu/tree-api-pt3-forrest'

1 files changed, 28 insertions, 26 deletions

diff --git a/lib/btrfs/io2_lv.go b/lib/btrfs/io2_lv.go
index 44378a0..e9de215 100644
--- a/lib/btrfs/io2_lv.go
+++ b/lib/btrfs/io2_lv.go
@@ -161,37 +161,39 @@ func (fs *FS) initDev(ctx context.Context, sb btrfstree.Superblock) error {
 			}
 		}
 	}
+	chunkTree, err := fs.ForrestLookup(ctx, btrfsprim.CHUNK_TREE_OBJECTID)
+	if err != nil {
+		return err
+	}
+
 	var errs derror.MultiError
-	fs.TreeWalk(ctx, btrfsprim.CHUNK_TREE_OBJECTID,
-		func(err *btrfstree.TreeError) {
-			errs = append(errs, err)
-		},
-		btrfstree.TreeWalkHandler{
-			Item: func(_ btrfstree.Path, item btrfstree.Item) {
-				if item.Key.ItemType != btrfsitem.CHUNK_ITEM_KEY {
-					return
-				}
-				switch itemBody := item.Body.(type) {
-				case *btrfsitem.Chunk:
-					for _, mapping := range itemBody.Mappings(item.Key) {
-						if err := fs.LV.AddMapping(mapping); err != nil {
-							errs = append(errs, err)
-						}
-					}
-				case *btrfsitem.Error:
-					// do nothing
-				default:
-					// This is a panic because the item decoder should not emit CHUNK_ITEM items as
-					// anything but btrfsitem.Chunk or btrfsitem.Error without this code also being
-					// updated.
-					panic(fmt.Errorf("should not happen: CHUNK_ITEM has unexpected item type: %T", itemBody))
+	if err := chunkTree.TreeRange(ctx, func(item btrfstree.Item) bool {
+		if item.Key.ItemType != btrfsitem.CHUNK_ITEM_KEY {
+			return true
+		}
+		switch itemBody := item.Body.(type) {
+		case *btrfsitem.Chunk:
+			for _, mapping := range itemBody.Mappings(item.Key) {
+				if err := fs.LV.AddMapping(mapping); err != nil {
+					errs = append(errs, err)
 				}
-			},
-		},
-	)
+			}
+		case *btrfsitem.Error:
+			// do nothing
+		default:
+			// This is a panic because the item decoder should not emit CHUNK_ITEM items as
+			// anything but btrfsitem.Chunk or btrfsitem.Error without this code also being
+			// updated.
+			panic(fmt.Errorf("should not happen: CHUNK_ITEM has unexpected item type: %T", itemBody))
+		}
+		return true
+	}); err != nil {
+		errs = append(errs, err)
+	}
 	if len(errs) > 0 {
 		return errs
 	}
+
 	return nil
 }