diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2023-03-22 13:43:15 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2023-03-23 18:35:46 -0600 |
| commit | d11a5357df7d155a7a3e92a67971d3d52ff6ad86 (patch) | |
| tree | 1d9bfe0ce8b12bb2698f2ff961198534718ba051 /lib/btrfsutil | |
| parent | 5520c20c493d52d83288bc2e321117006e38fd1a (diff) | |
btrfstree: Add a 'generation' argument the owner validation
Validating a node's owner properly requires the generation.
But don't worry about actually doing it properly yet, just update the API
first.
Diffstat (limited to 'lib/btrfsutil')
| -rw-r--r-- | lib/btrfsutil/old_rebuilt_forrest.go | 2 | ||||
| -rw-r--r-- | lib/btrfsutil/rebuilt_readitem.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/btrfsutil/old_rebuilt_forrest.go b/lib/btrfsutil/old_rebuilt_forrest.go index bb5ab59..a3fc0e2 100644 --- a/lib/btrfsutil/old_rebuilt_forrest.go +++ b/lib/btrfsutil/old_rebuilt_forrest.go @@ -240,7 +240,7 @@ func (bt *OldRebuiltForrest) readNode(nodeInfo nodeInfo) *btrfstree.Node { LAddr: containers.OptionalValue(nodeInfo.LAddr), Level: containers.OptionalValue(nodeInfo.Level), Generation: containers.OptionalValue(nodeInfo.Generation), - Owner: func(treeID btrfsprim.ObjID) error { + Owner: func(treeID btrfsprim.ObjID, _ btrfsprim.Generation) error { if treeID != nodeInfo.Owner { return fmt.Errorf("expected owner=%v but claims to have owner=%v", nodeInfo.Owner, treeID) diff --git a/lib/btrfsutil/rebuilt_readitem.go b/lib/btrfsutil/rebuilt_readitem.go index ff919f0..5de6864 100644 --- a/lib/btrfsutil/rebuilt_readitem.go +++ b/lib/btrfsutil/rebuilt_readitem.go @@ -42,7 +42,7 @@ func (ts *RebuiltForrest) readNode(ctx context.Context, laddr btrfsvol.LogicalAd LAddr: containers.OptionalValue(laddr), Level: containers.OptionalValue(graphInfo.Level), Generation: containers.OptionalValue(graphInfo.Generation), - Owner: func(treeID btrfsprim.ObjID) error { + Owner: func(treeID btrfsprim.ObjID, _ btrfsprim.Generation) error { if treeID != graphInfo.Owner { return fmt.Errorf("expected owner=%v but claims to have owner=%v", graphInfo.Owner, treeID) |