janis/bootloader
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

removed tree::find_key/find_key_rev in favour of entry/_rev

Browse source
This commit is contained in:
Janis 2023-04-05 21:31:56 +02:00
parent db762e0187
commit 6762812ec5
2 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
btrfs/src/v2/tree.rs
View file

@ -339,26 +339,6 @@ impl<R: super::Read> Tree<R> {
Ok(entry)
}
pub fn find_key<K>(&self, key: &K) -> Result<Option<(Item, TreeItem)>>
where
K: PartialEq<Key> + PartialOrd<Key>,
{
match self.find_node(key)? {
Some(node) => node.parse_item().map(|item| Some(item)),
None => Ok(None),
}
}
pub fn find_key_rev<K>(&self, key: &K) -> Result<Option<(Item, TreeItem)>>
where
K: PartialEq<Key> + PartialOrd<Key>,
{
match self.find_node_rev(key)? {
Some(node) => node.parse_item().map(|item| Some(item)),
None => Ok(None),
}
}
pub fn find_range<K>(&self, key: &K) -> Result<Range<R>>
where
K: PartialEq<Key> + PartialOrd<Key>,

9
btrfs/src/v2/volume.rs
View file

@ -322,14 +322,15 @@ impl<R: super::Read> Volume2<R> {
0x8dbfc2d2, // crc of "default"
);
let subvol_root = root_tree
.find_key(&key)?
.ok_or(Error::NoDefaultSubvolRoot)?;
let subvol_root = match root_tree.entry(&key)? {
super::tree::entry::Entry::Occupied(entry) => Some(entry.value()?),
super::tree::entry::Entry::Vacant(_) => None,
}
.ok_or(Error::NoDefaultSubvolRoot)?;
// if we found the dir entry of the "default subvol" (mharmstone nomenclature)
// we then look for the root fs tree in the root tree with the ID found in the `.location` of the dir_item only (from mharmstone)
let subvol_id = subvol_root
.1
.as_dir_item()
.expect("dir item")
.first()