Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BTRFS: Some modifications of BTree _Find

Browse Source 
* Added "read" argument, may change variable type in the future instead of just bool variable.
* Now search key's objectId is changed to found key's objectId.
This commit is contained in:
hyche 2017-07-05 00:08:54 +07:00
parent a4a1be758a
commit 46eba5c02d
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/add-ons/kernel/file_systems/btrfs/BTree.cpp
View File

@ -203,7 +203,7 @@ btrfs_key::Compare(const btrfs_key& key) const
*/
status_t
BTree::_Find(btrfs_key& key, void** _value, size_t* _size,
btree_traversing type)
bool read, btree_traversing type)
{
TRACE("Find() objectid %" B_PRId64 " type %d offset %" B_PRId64 " \n",
key.ObjectID(), key.Type(), key.Offset());
@ -229,8 +229,15 @@ BTree::_Find(btrfs_key& key, void** _value, size_t* _size,
TRACE("Find() dump count %" B_PRId32 "\n", node.ItemCount());
ret = node.SearchSlot(key, &slot, type);
if ((slot >= node.ItemCount() || node.Item(slot)->key.Type() != key.Type())
&& read == true
|| ret != B_OK) {
TRACE("Find() not found %" B_PRId64 " %" B_PRId64 "\n", key.Offset(),
key.ObjectID());
return B_ENTRY_NOT_FOUND;
}
if ( ret == B_OK && node.Item(slot)->key.Type() == key.Type()) {
if (read == true) {
TRACE("Find() found %" B_PRIu32 " %" B_PRIu32 "\n",
node.Item(slot)->Offset(), node.Item(slot)->Size());
@ -239,38 +246,35 @@ BTree::_Find(btrfs_key& key, void** _value, size_t* _size,
memcpy(*_value, node.ItemData(slot),
node.Item(slot)->Size());
key.SetOffset(node.Item(slot)->key.Offset());
key.SetObjectID(node.Item(slot)->key.ObjectID());
if (_size != NULL)
*_size = node.Item(slot)->Size();
}
return B_OK;
} else {
*_value = (void*)&slot;
}
TRACE("Find() not found %" B_PRId64 " %" B_PRId64 "\n", key.Offset(),
key.ObjectID());
return B_ENTRY_NOT_FOUND;
return B_OK;
}
status_t
BTree::FindNext(btrfs_key& key, void** _value, size_t* _size)
BTree::FindNext(btrfs_key& key, void** _value, size_t* _size, bool read)
{
return _Find(key, _value, _size, BTREE_FORWARD);
return _Find(key, _value, _size, read, BTREE_FORWARD);
}
status_t
BTree::FindPrevious(btrfs_key& key, void** _value, size_t* _size)
BTree::FindPrevious(btrfs_key& key, void** _value, size_t* _size, bool read)
{
return _Find(key, _value, _size, BTREE_BACKWARD);
return _Find(key, _value, _size, read, BTREE_BACKWARD);
}
status_t
BTree::FindExact(btrfs_key& key, void** _value, size_t* _size)
BTree::FindExact(btrfs_key& key, void** _value, size_t* _size, bool read)
{
return _Find(key, _value, _size, BTREE_EXACT);
return _Find(key, _value, _size, read, BTREE_EXACT);
}
@ -338,7 +342,7 @@ TreeIterator::Traverse(btree_traversing direction, btrfs_key& key,
fCurrentKey.SetOffset(fCurrentKey.Offset() + direction);
status_t status = fTree->_Find(fCurrentKey, value, size,
direction);
true, direction);
if (status != B_OK) {
TRACE("TreeIterator::Traverse() Find failed\n");
return B_ENTRY_NOT_FOUND;

10
src/add-ons/kernel/file_systems/btrfs/BTree.h
View File

@ -50,11 +50,11 @@ public:
fsblock_t rootBlock);
~BTree();
status_t FindExact(btrfs_key& key, void** value,
size_t* size = NULL);
size_t* size = NULL, bool read = true);
status_t FindNext(btrfs_key& key, void** value,
size_t* size = NULL);
size_t* size = NULL, bool read = true);
status_t FindPrevious(btrfs_key& key, void** value,
size_t* size = NULL);
size_t* size = NULL, bool read = true);
Volume* SystemVolume() const { return fVolume; }
@ -67,8 +67,8 @@ private:
BTree& operator=(const BTree& other);
// no implementation
status_t _Find(btrfs_key& key, void** value,
size_t* size, btree_traversing type);
status_t _Find(btrfs_key& key, void** value, size_t* size,
bool read, btree_traversing type);
void _AddIterator(TreeIterator* iterator);
void _RemoveIterator(TreeIterator* iterator);
private: