From 9814752ef68aa9ef377a4a939bc83d2409d4fcef Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 16 Apr 2023 23:51:14 -0600 Subject: btrfstree: Path.NodeExpectations(): Drop the ability to fail open --- lib/btrfsutil/old_rebuilt_forrest.go | 2 +- lib/btrfsutil/rebuilt_tree.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/btrfsutil') diff --git a/lib/btrfsutil/old_rebuilt_forrest.go b/lib/btrfsutil/old_rebuilt_forrest.go index b03ddc2..a23278c 100644 --- a/lib/btrfsutil/old_rebuilt_forrest.go +++ b/lib/btrfsutil/old_rebuilt_forrest.go @@ -190,7 +190,7 @@ func (bt *OldRebuiltForrest) rawTreeWalk(ctx context.Context, treeID btrfsprim.O var curNode oldRebuiltNodeInfo cbs := btrfstree.TreeWalkHandler{ BadNode: func(path btrfstree.Path, node *btrfstree.Node, err error) bool { - nodeAddr, nodeExp, _ := path.NodeExpectations(ctx, false) + nodeAddr, nodeExp, _ := path.NodeExpectations(ctx) cacheEntry.Errors.Insert(oldRebuiltTreeError{ Min: nodeExp.MinItem.Val, Max: nodeExp.MaxItem.Val, diff --git a/lib/btrfsutil/rebuilt_tree.go b/lib/btrfsutil/rebuilt_tree.go index 8d5921b..e963f0a 100644 --- a/lib/btrfsutil/rebuilt_tree.go +++ b/lib/btrfsutil/rebuilt_tree.go @@ -660,7 +660,7 @@ func (walker *rebuiltWalker) walk(ctx context.Context, path btrfstree.Path) { } // 001 - nodeAddr, nodeExp, ok := path.NodeExpectations(ctx, false) + nodeAddr, nodeExp, ok := path.NodeExpectations(ctx) if !ok { panic(fmt.Errorf("should not happen: btrfsutil.rebuiltWalker.walk called with non-node path: %v", path)) -- cgit v1.2.3-2-g168b