From b7d8ef5a0d83bbf8f8d642e00d36db65f3407b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 1 Aug 2005 14:17:41 +0000 Subject: [PATCH] The term vnode_ptr is not used anywhere else; renamed vfs_put_vnode_ptr() to vfs_put_vnode(). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13865 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/vfs.h | 2 +- src/system/kernel/elf.c | 4 ++-- src/system/kernel/fs/vfs.cpp | 9 +++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/headers/private/kernel/vfs.h b/headers/private/kernel/vfs.h index 0cc85e78ab..c6c8d49d24 100644 --- a/headers/private/kernel/vfs.h +++ b/headers/private/kernel/vfs.h @@ -69,7 +69,7 @@ int vfs_get_vnode_from_fd(int fd, bool kernel, void **vnode); status_t vfs_get_vnode_from_path(const char *path, bool kernel, void **vnode); status_t vfs_get_vnode(mount_id mountID, vnode_id vnodeID, void **_vnode); status_t vfs_lookup_vnode(mount_id mountID, vnode_id vnodeID, void **_vnode); -int vfs_put_vnode_ptr(void *vnode); +void vfs_put_vnode(void *vnode); void vfs_vnode_acquire_ref(void *vnode); void vfs_vnode_release_ref(void *vnode); status_t vfs_get_cookie_from_fd(int fd, void **_cookie); diff --git a/src/system/kernel/elf.c b/src/system/kernel/elf.c index ae7f99c3bf..c92c4e049b 100644 --- a/src/system/kernel/elf.c +++ b/src/system/kernel/elf.c @@ -667,7 +667,7 @@ unload_elf_image(struct elf_image_info *image) delete_area(image->data_region.id); if (image->vnode) - vfs_put_vnode_ptr(image->vnode); + vfs_put_vnode(image->vnode); unregister_elf_image(image); @@ -1405,7 +1405,7 @@ error: mutex_unlock(&sImageLoadMutex); error0: if (vnode) - vfs_put_vnode_ptr(vnode); + vfs_put_vnode(vnode); _kern_close(fd); return err; diff --git a/src/system/kernel/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp index 068cf9a7e1..55042b5a89 100644 --- a/src/system/kernel/fs/vfs.cpp +++ b/src/system/kernel/fs/vfs.cpp @@ -2405,13 +2405,10 @@ vfs_normalize_path(const char *path, char *buffer, size_t bufferSize, } -int -vfs_put_vnode_ptr(void *_vnode) +extern "C" void +vfs_put_vnode(void *_vnode) { - struct vnode *vnode = (struct vnode *)_vnode; - - put_vnode(vnode); - return 0; + put_vnode((struct vnode *)_vnode); }