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

The rootfs was calling remove_vnode() on nodes for which it might not

Browse Source 
have had a reference.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24818 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2008-04-06 00:27:36 +00:00
parent 717705d816
commit a8cba5904f
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/system/kernel/fs/rootfs.cpp
View File

@ -278,20 +278,27 @@ rootfs_is_dir_empty(struct rootfs_vnode *dir)
/** You must hold the FS lock when calling this function */ /** You must hold the FS lock when calling this function */
static status_t static status_t
remove_node(struct rootfs *fs, struct rootfs_vnode *directory, struct rootfs_vnode *vnode) remove_node(struct rootfs *fs, struct rootfs_vnode *directory,
struct rootfs_vnode *vnode)
{ {
// schedule this vnode to be removed when it's ref goes to zero // schedule this vnode to be removed when it's ref goes to zero
// TODO: This can fail, if the caller doesn't have a reference to the node
// in question. And some code paths don't guarantee that (rootfs_remove_dir()
// for example).
status_t status = remove_vnode(fs->volume, vnode->id);
if (status < B_OK)
return status;
rootfs_remove_from_dir(fs, directory, vnode); void* dummy;
notify_entry_removed(fs->id, directory->id, vnode->name, vnode->id); bool gotNode = (get_vnode(fs->volume, vnode->id, &dummy) == B_OK);
return B_OK; status_t status = B_OK;
if (gotNode)
status = remove_vnode(fs->volume, vnode->id);
if (status == B_OK) {
rootfs_remove_from_dir(fs, directory, vnode);
notify_entry_removed(fs->id, directory->id, vnode->name, vnode->id);
}
if (gotNode)
put_vnode(fs->volume, vnode->id);
return status;
} }