From 78e7cdaedefec77f0b0d7cb145c34736c3553600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 16 Apr 2009 18:29:12 +0000 Subject: [PATCH] * Removed the get_next_removed_vnode() call again - besides the problems Ingo 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 --- headers/os/drivers/fs_interface.h | 2 -- src/system/kernel/fs/vfs.cpp | 57 ------------------------------- 2 files changed, 59 deletions(-) diff --git a/headers/os/drivers/fs_interface.h b/headers/os/drivers/fs_interface.h index 4df0c2ca9c..228a906f49 100644 --- a/headers/os/drivers/fs_interface.h +++ b/headers/os/drivers/fs_interface.h @@ -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 get_vnode_removed(fs_volume* volume, ino_t vnodeID, 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 status_t read_pages(int fd, off_t pos, const struct iovec* vecs, diff --git a/src/system/kernel/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp index e1a65ac495..775c71b9c8 100644 --- a/src/system/kernel/fs/vfs.cpp +++ b/src/system/kernel/fs/vfs.cpp @@ -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* volume_for_vnode(fs_vnode* _vnode) {