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

* Changed Vnode to be more flexible to use, and reduced its memory footprint

Browse Source 
a bit.
* This also fixes a bug Salvatore pointed me to: Vnode would also call
  put_vnode() on destruction if get_vnode() failed earlier.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26097 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-06-23 09:55:04 +00:00
parent 1fd024be6a
commit 45a237d7f4
1 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/add-ons/kernel/file_systems/bfs/Inode.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2001-2007, Axel Dörfler, axeld@pinc-software.de.
* Copyright 2001-2008, Axel Dörfler, axeld@pinc-software.de.
* This file may be used under the terms of the MIT License.
*/
#ifndef INODE_H
@ -253,46 +253,73 @@ class NodeGetter : public CachedBlock {
class Vnode {
public:
Vnode(Volume *volume, ino_t id)
Vnode(Volume* volume, ino_t id)
:
fVolume(volume),
fID(id)
fInode(NULL)
{
SetTo(volume, id);
}
Vnode(Volume *volume, block_run run)
Vnode(Volume* volume, block_run run)
:
fVolume(volume),
fID(volume->ToVnode(run))
fInode(NULL)
{
SetTo(volume, run);
}
Vnode()
:
fStatus(B_NO_INIT),
fInode(NULL)
{
}
~Vnode()
{
Put();
Unset();
}
status_t Get(Inode **_inode)
status_t InitCheck()
{
// should we check inode against NULL here? it should not be necessary
return get_vnode(fVolume->FSVolume(), fID, (void **)_inode);
return fStatus;
}
void Put()
void Unset()
{
if (fVolume)
put_vnode(fVolume->FSVolume(), fID);
fVolume = NULL;
if (fInode != NULL) {
put_vnode(fInode->GetVolume()->FSVolume(), fInode->ID());
fInode = NULL;
fStatus = B_NO_INIT;
}
}
status_t SetTo(Volume* volume, ino_t id)
{
Unset();
return fStatus = get_vnode(volume->FSVolume(), id, (void**)&fInode);
}
status_t SetTo(Volume* volume, block_run run)
{
return SetTo(volume, volume->ToVnode(run));
}
status_t Get(Inode** _inode)
{
if (fStatus == B_OK)
*_inode = fInode;
return fStatus;
}
void Keep()
{
fVolume = NULL;
fInode = NULL;
}
private:
Volume *fVolume;
ino_t fID;
status_t fStatus;
Inode* fInode;
};