From a0c74207242563eb518fba43ab7ac642b58f04f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 7 Jun 2004 14:30:56 +0000 Subject: [PATCH] Changes due to renaming the public fs functions. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7803 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/core/fs/bootfs.c | 2 +- src/kernel/core/fs/devfs.c | 10 +++++----- src/kernel/core/fs/pipefs.cpp | 8 ++++---- src/kernel/core/fs/rootfs.c | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/kernel/core/fs/bootfs.c b/src/kernel/core/fs/bootfs.c index 756f5fbee6..d05bfcdeab 100755 --- a/src/kernel/core/fs/bootfs.c +++ b/src/kernel/core/fs/bootfs.c @@ -512,7 +512,7 @@ bootfs_lookup(fs_volume _fs, fs_vnode _dir, const char *name, vnode_id *_id, int goto err; } - status = vfs_get_vnode(fs->id, vnode->id, (fs_vnode *)&vdummy); + status = get_vnode(fs->id, vnode->id, (fs_vnode *)&vdummy); if (status < 0) goto err; diff --git a/src/kernel/core/fs/devfs.c b/src/kernel/core/fs/devfs.c index fea0160e92..a44570b675 100755 --- a/src/kernel/core/fs/devfs.c +++ b/src/kernel/core/fs/devfs.c @@ -169,7 +169,7 @@ devfs_delete_vnode(struct devfs *fs, struct devfs_vnode *v, bool force_delete) // TK: for partitions, we have to release the raw device if (v->stream.type == STREAM_TYPE_DEVICE && v->stream.u.dev.part_map) - vfs_put_vnode(fs->id, v->stream.u.dev.part_map->raw_vnode->id); + put_vnode(fs->id, v->stream.u.dev.part_map->raw_vnode->id); if (v->name != NULL) free(v->name); @@ -362,7 +362,7 @@ devfs_set_partition( struct devfs *fs, struct devfs_vnode *v, // increase reference count of raw device - // the partition device really needs it // (at least to resolve its name on GET_PARTITION_INFO) - res = vfs_get_vnode(fs->id, v->id, (fs_vnode *)&part_map->raw_vnode); + res = get_vnode(fs->id, v->id, (fs_vnode *)&part_map->raw_vnode); if (res < 0) goto err1; @@ -398,7 +398,7 @@ err1: err2: mutex_unlock(&gDeviceFileSystem->lock); - vfs_put_vnode(fs->id, v->id); + put_vnode(fs->id, v->id); free(part_map); return res; } @@ -535,7 +535,7 @@ devfs_lookup(fs_volume _fs, fs_vnode _dir, const char *name, vnode_id *_id, int goto err; } - err = vfs_get_vnode(fs->id, vnode->id, (fs_vnode *)&vdummy); + err = get_vnode(fs->id, vnode->id, (fs_vnode *)&vdummy); if (err < 0) goto err; @@ -989,7 +989,7 @@ devfs_unlink(fs_volume _fs, fs_vnode _dir, const char *name) if (status < 0) goto err; - status = vfs_remove_vnode(fs->id, vnode->id); + status = remove_vnode(fs->id, vnode->id); err: mutex_unlock(&fs->lock); diff --git a/src/kernel/core/fs/pipefs.cpp b/src/kernel/core/fs/pipefs.cpp index f81b52bb36..da7d99917b 100644 --- a/src/kernel/core/fs/pipefs.cpp +++ b/src/kernel/core/fs/pipefs.cpp @@ -204,7 +204,7 @@ Volume::~Volume() { // put_vnode on the root to release the ref to it if (fRootNode) - vfs_put_vnode(ID(), fRootNode->ID()); + put_vnode(ID(), fRootNode->ID()); if (fNodeHash != NULL) { // delete all of the inodes @@ -265,7 +265,7 @@ Volume::CreateNode(const char *name, int32 type) InsertNode(inode); hash_insert(fNodeHash, inode); - vfs_new_vnode(ID(), inode->ID(), inode); + new_vnode(ID(), inode->ID(), inode); return inode; } @@ -396,7 +396,7 @@ Volume::RemoveNode(Inode *directory, const char *name) notify_listener(B_ENTRY_REMOVED, ID(), directory->ID(), 0, inode->ID(), name); // schedule this vnode to be removed when it's ref goes to zero - vfs_remove_vnode(ID(), inode->ID()); + remove_vnode(ID(), inode->ID()); err: Unlock(); @@ -810,7 +810,7 @@ pipefs_lookup(fs_volume _volume, fs_vnode _dir, const char *name, vnode_id *_id, } Inode *dummy; - status = vfs_get_vnode(volume->ID(), inode->ID(), (fs_vnode *)&dummy); + status = get_vnode(volume->ID(), inode->ID(), (fs_vnode *)&dummy); if (status < B_OK) goto err; diff --git a/src/kernel/core/fs/rootfs.c b/src/kernel/core/fs/rootfs.c index 0afb1febe3..612629cf68 100755 --- a/src/kernel/core/fs/rootfs.c +++ b/src/kernel/core/fs/rootfs.c @@ -267,7 +267,7 @@ rootfs_remove(struct rootfs *fs, struct rootfs_vnode *dir, const char *name, boo notify_listener(B_ENTRY_REMOVED, fs->id, dir->id, 0, vnode->id, name); // schedule this vnode to be removed when it's ref goes to zero - vfs_remove_vnode(fs->id, vnode->id); + remove_vnode(fs->id, vnode->id); err: mutex_unlock(&fs->lock); @@ -343,7 +343,7 @@ rootfs_unmount(fs_volume _fs) TRACE(("rootfs_unmount: entry fs = %p\n", fs)); // put_vnode on the root to release the ref to it - vfs_put_vnode(fs->id, fs->root_vnode->id); + put_vnode(fs->id, fs->root_vnode->id); // delete all of the vnodes hash_open(fs->vnode_list_hash, &i); @@ -390,7 +390,7 @@ rootfs_lookup(fs_volume _fs, fs_vnode _dir, const char *name, vnode_id *_id, int goto err; } - status = vfs_get_vnode(fs->id, vnode->id, (fs_vnode *)&vdummy); + status = get_vnode(fs->id, vnode->id, (fs_vnode *)&vdummy); if (status < 0) goto err;