From b6a7ab5f6c1fe993271242021c3ed4050733fdf2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 29 Aug 2022 19:25:47 -0600 Subject: wip --- lib/btrfs/btrfstree/readnode.go | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'lib/btrfs/btrfstree') diff --git a/lib/btrfs/btrfstree/readnode.go b/lib/btrfs/btrfstree/readnode.go index bb80d20..b1c34e4 100644 --- a/lib/btrfs/btrfstree/readnode.go +++ b/lib/btrfs/btrfstree/readnode.go @@ -13,14 +13,26 @@ import ( "git.lukeshu.com/btrfs-progs-ng/lib/diskio" ) +type NodeFile interface { + diskio.File[btrfsvol.LogicalAddr] + Superblock() (*Superblock, error) + + // ParentTree, given a tree ID, returns that tree's parent + // tree, if it has one. + // + // - non-zero, true : the parent tree ID + // + // - 0, true : the tree does not have a parent + // + // - any, false : the tree's parent information could not be + // looked up + ParentTree(btrfsprim.ObjID) (btrfsprim.ObjID, bool) +} + // FSReadNode is a utility function to help with implementing the // 'NodeSource' interface. func FSReadNode( - fs interface { - diskio.File[btrfsvol.LogicalAddr] - Superblock() (*Superblock, error) - ParentTree(btrfsprim.ObjID) (btrfsprim.ObjID, bool) - }, + fs NodeFile, path TreePath, ) (*diskio.Ref[btrfsvol.LogicalAddr, Node], error) { sb, err := fs.Superblock() @@ -39,6 +51,11 @@ func FSReadNode( var ok bool exp, ok = fs.ParentTree(exp) if !ok { + // Failed lookup up parent info; fail open. + return nil + } + if exp == 0 { + // End of the line. return fmt.Errorf("expected owner in %v but claims to have owner=%v", treeParents, owner) } -- cgit v1.2.3-54-g00ecf