i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Removed the get_next_removed_vnode() call again - besides the problems Ingo

Browse Source 
pointed out, there is also an unsolvable race condition with BFS that other
  file systems should share.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30204 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-04-16 18:29:12 +00:00
parent 992fba36ee
commit 78e7cdaede
2 changed files with 0 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/drivers/fs_interface.h
-2
View File
@@ -317,8 +317,6 @@ extern status_t remove_vnode(fs_volume* volume, ino_t vnodeID);
extern status_t unremove_vnode(fs_volume* volume, ino_t vnodeID); extern status_t unremove_vnode(fs_volume* volume, ino_t vnodeID);
extern status_t get_vnode_removed(fs_volume* volume, ino_t vnodeID, extern status_t get_vnode_removed(fs_volume* volume, ino_t vnodeID,
bool* _removed); bool* _removed);
extern status_t get_next_removed_vnode(fs_volume* volume, ino_t* _vnodeID,
void** _privateNode);
extern fs_volume* volume_for_vnode(fs_vnode* vnode); extern fs_volume* volume_for_vnode(fs_vnode* vnode);
extern status_t read_pages(int fd, off_t pos, const struct iovec* vecs, extern status_t read_pages(int fd, off_t pos, const struct iovec* vecs,
src/system/kernel/fs/vfs.cpp
-57
View File
@@ -3774,63 +3774,6 @@ get_vnode_removed(fs_volume* volume, ino_t vnodeID, bool* _removed)
} }
/*! Iterates over all removed vnodes of the volume. You own a reference to the
vnode when this call returns; you must initialize *_parentNode with NULL when
calling this function the first time, subsequent calls will automatically
put the previous reference again.
*/
extern "C" status_t
get_next_removed_vnode(fs_volume* volume, ino_t* _vnodeID, void** _privateNode)
{
fs_mount* mount;
status_t status = get_mount(volume->id, &mount);
if (status != B_OK)
return status;
// Retrieve the previous vnode
struct vnode* vnode = NULL;
if (*_privateNode != NULL) {
MutexLocker _(sVnodeMutex);
vnode = lookup_vnode(volume->id, *_vnodeID);
// we already have a reference, so this vnode won't get away
}
// Determine the ID of the next one
RecursiveLocker locker(mount->rlock);
struct vnode* nextVnode;
if (vnode == NULL)
nextVnode = mount->vnodes.First();
else {
nextVnode = mount->vnodes.GetNext(vnode);
dec_vnode_ref_count(vnode, false, true);
}
while (nextVnode != NULL && !nextVnode->remove) {
nextVnode = mount->vnodes.GetNext(nextVnode);
}
if (nextVnode == NULL)
return B_ENTRY_NOT_FOUND;
*_vnodeID = nextVnode->id;
locker.Unlock();
// Try to retrieve the vnode by ID, and return it's private node on success
status = get_vnode(volume->id, *_vnodeID, &vnode, true, true);
if (status != B_OK)
return status;
*_privateNode = vnode->private_node;
return B_OK;
}
extern "C" fs_volume* extern "C" fs_volume*
volume_for_vnode(fs_vnode* _vnode) volume_for_vnode(fs_vnode* _vnode)
{ {