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

* Factored out the vnode disconnection code from fs_unmount() to a separate

Browse Source 
function, and added a vfs_disconnect_vnode() for other kernel components.
* devfs_unpublish_device() can now optionally make use of this call.
* Fixed the type check of devfs' unpublish_node().


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16907 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-03-28 01:13:12 +00:00
parent 065aa7f66c
commit 606e0d364e
4 changed files with 158 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/fs/devfs.cpp
+35 -19
View File
@@ -641,29 +641,35 @@ get_node_for_path(struct devfs *fs, const char *path, struct devfs_vnode **_node
static status_t
unpublish_node(struct devfs *fs, const char *path, int type)
unpublish_node(struct devfs *fs, devfs_vnode *node, mode_t type)
{
if ((node->stream.type & S_IFMT) != type)
return B_BAD_TYPE;
recursive_lock_lock(&fs->lock);
status_t status = devfs_remove_from_dir(node->parent, node);
if (status < B_OK)
goto out;
status = remove_vnode(fs->id, node->id);
out:
recursive_lock_unlock(&fs->lock);
return status;
}
static status_t
unpublish_node(struct devfs *fs, const char *path, mode_t type)
{
devfs_vnode *node;
status_t status = get_node_for_path(fs, path, &node);
if (status != B_OK)
return status;
if ((type & S_IFMT) != type) {
status = B_BAD_TYPE;
goto err1;
}
status = unpublish_node(fs, node, type);
recursive_lock_lock(&fs->lock);
status = devfs_remove_from_dir(node->parent, node);
if (status < B_OK)
goto err2;
status = remove_vnode(fs->id, node->id);
err2:
recursive_lock_unlock(&fs->lock);
err1:
put_vnode(fs->id, node->id);
return status;
}
@@ -2117,10 +2123,20 @@ devfs_publish_partition(const char *path, const partition_info *info)
extern "C" status_t
devfs_unpublish_device(const char *path)
devfs_unpublish_device(const char *path, bool disconnect)
{
// TODO: disconnect any open file handles!
return unpublish_node(sDeviceFileSystem, path, S_IFCHR);
devfs_vnode *node;
status_t status = get_node_for_path(sDeviceFileSystem, path, &node);
if (status != B_OK)
return status;
status = unpublish_node(sDeviceFileSystem, node, S_IFCHR);
if (status == B_OK && disconnect)
vfs_disconnect_vnode(sDeviceFileSystem->id, node->id);
put_vnode(sDeviceFileSystem->id, node->id);
return status;
}