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

Fixed a couple of bugs:

Browse Source 
* fs_unmount() freed vnodes, but didn't remove them from the unused list if
  needed.
* vfs_get_module_path() could put a vnode twice under several situations.
* vnode_path_to_vnode() now always puts the dir vnode, even if the provided
  path is NULL. Documented the fact that it does eat the ref, too.
* Added a to-do item in vfs_get_vnode_cache() about a possible problem.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16662 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-03-08 21:42:14 +00:00
parent b608af899a
commit f951ca0e6a
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/fs/vfs.cpp
+20 -7
View File
@@ -1417,6 +1417,8 @@ entry_ref_to_vnode(mount_id mountID, vnode_id directoryID, const char *name, str
* \a path must not be NULL. * \a path must not be NULL.
* If it returns successfully, \a path contains the name of the last path * If it returns successfully, \a path contains the name of the last path
* component. * component.
* Note, this reduces the ref_count of the starting \a vnode, no matter if
* it is successful or not!
*/ */
static status_t static status_t
@@ -1429,8 +1431,10 @@ vnode_path_to_vnode(struct vnode *vnode, char *path, bool traverseLeafLink,
FUNCTION(("vnode_path_to_vnode(vnode = %p, path = %s)\n", vnode, path)); FUNCTION(("vnode_path_to_vnode(vnode = %p, path = %s)\n", vnode, path));
if (path == NULL) if (path == NULL) {
put_vnode(vnode);
return B_BAD_VALUE; return B_BAD_VALUE;
}
while (true) { while (true) {
struct vnode *nextVnode; struct vnode *nextVnode;
@@ -2721,10 +2725,10 @@ vfs_get_module_path(const char *basePath, const char *moduleName, char *pathBuff
moduleName = nextPath; moduleName = nextPath;
status = vnode_path_to_vnode(dir, path, true, 0, &file, NULL, &type); status = vnode_path_to_vnode(dir, path, true, 0, &file, NULL, &type);
if (status < B_OK) if (status < B_OK) {
goto err; // vnode_path_to_vnode() has already released the reference to dir
return status;
put_vnode(dir); }
if (S_ISDIR(type)) { if (S_ISDIR(type)) {
// goto the next directory // goto the next directory
@@ -2742,6 +2746,7 @@ vfs_get_module_path(const char *basePath, const char *moduleName, char *pathBuff
} else { } else {
TRACE(("vfs_get_module_path(): something is strange here: %d...\n", type)); TRACE(("vfs_get_module_path(): something is strange here: %d...\n", type));
status = B_ERROR; status = B_ERROR;
dir = file;
goto err; goto err;
} }
} }
@@ -2934,6 +2939,8 @@ vfs_get_vnode_cache(void *_vnode, vm_cache_ref **_cache, bool allocate)
// The cache could have been created in the meantime // The cache could have been created in the meantime
if (vnode->cache == NULL) { if (vnode->cache == NULL) {
if (allocate) { if (allocate) {
// TODO: actually the vnode need to be busy already here, or
// else this won't work...
bool wasBusy = vnode->busy; bool wasBusy = vnode->busy;
vnode->busy = true; vnode->busy = true;
mutex_unlock(&sVnodeMutex); mutex_unlock(&sVnodeMutex);
@@ -3781,8 +3788,8 @@ fix_dirent(struct vnode *parent, struct dirent *entry)
if (strcmp(entry->d_name, "..") == 0 if (strcmp(entry->d_name, "..") == 0
&& parent->mount->root_vnode == parent && parent->mount->root_vnode == parent
&& parent->mount->covers_vnode) { && parent->mount->covers_vnode) {
inc_vnode_ref_count(parent);
inc_vnode_ref_count(parent); // vnode_path_to_vnode() puts the node // vnode_path_to_vnode() puts the node
struct vnode *vnode; struct vnode *vnode;
status_t status = vnode_path_to_vnode(parent, "..", false, 0, &vnode, status_t status = vnode_path_to_vnode(parent, "..", false, 0, &vnode,
@@ -5381,6 +5388,12 @@ fs_unmount(char *path, uint32 flags, bool kernel)
while ((vnode = (struct vnode *)list_get_next_item(&mount->vnodes, vnode)) != NULL) { while ((vnode = (struct vnode *)list_get_next_item(&mount->vnodes, vnode)) != NULL) {
vnode->busy = true; vnode->busy = true;
if (vnode->ref_count == 0) {
// this vnode has been unused before
list_remove_item(&sUnusedVnodeList, vnode);
sUnusedVnodes--;
}
} }
mutex_unlock(&sVnodeMutex); mutex_unlock(&sVnodeMutex);