From 5d3147f66a54bd98707e1801e6f14cb29de72631 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 26 Feb 2007 16:26:02 +0000 Subject: [PATCH] Class renaming: UserFileSystem -> FileSystem UserVolume -> Volume KernelUserFileSystem -> BeOSKernelFileSystem KernelUserVolume -> BeOSKernelVolume The BeOSKernel* classes are indeed intended to handle FS implementations that use the (old) BeOS FS interface. We'll see how well that will work. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20239 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../server/BeOSKernelFileSystem.cpp | 45 ++++++ .../userlandfs/server/BeOSKernelFileSystem.h | 26 ++++ ...nelUserVolume.cpp => BeOSKernelVolume.cpp} | 126 ++++++++--------- ...{KernelUserVolume.h => BeOSKernelVolume.h} | 18 +-- .../userlandfs/server/DispatcherFileSystem.h | 6 +- .../userlandfs/server/FileSystem.cpp | 14 ++ .../userlandfs/server/FileSystem.h | 27 ++++ .../file_systems/userlandfs/server/Jamfile | 41 +++--- .../server/KernelUserFileSystem.cpp | 45 ------ .../userlandfs/server/KernelUserFileSystem.h | 26 ---- .../userlandfs/server/RequestThread.cpp | 8 +- .../userlandfs/server/RequestThread.h | 16 +-- .../userlandfs/server/UserFileSystem.cpp | 14 -- .../userlandfs/server/UserFileSystem.h | 27 ---- .../userlandfs/server/UserlandFSServer.cpp | 8 +- .../userlandfs/server/UserlandFSServer.h | 8 +- .../server/UserlandRequestHandler.cpp | 127 ++++++++--------- .../server/UserlandRequestHandler.h | 10 +- .../server/{UserVolume.cpp => Volume.cpp} | 130 +++++++++--------- .../server/{UserVolume.h => Volume.h} | 22 +-- .../userlandfs/server/kernel_emu.cpp | 20 +-- 21 files changed, 380 insertions(+), 384 deletions(-) create mode 100644 src/add-ons/kernel/file_systems/userlandfs/server/BeOSKernelFileSystem.cpp create mode 100644 src/add-ons/kernel/file_systems/userlandfs/server/BeOSKernelFileSystem.h rename src/add-ons/kernel/file_systems/userlandfs/server/{KernelUserVolume.cpp => BeOSKernelVolume.cpp} (73%) rename src/add-ons/kernel/file_systems/userlandfs/server/{KernelUserVolume.h => BeOSKernelVolume.h} (93%) create mode 100644 src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.cpp create mode 100644 src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.h delete mode 100644 src/add-ons/kernel/file_systems/userlandfs/server/KernelUserFileSystem.cpp delete mode 100644 src/add-ons/kernel/file_systems/userlandfs/server/KernelUserFileSystem.h delete mode 100644 src/add-ons/kernel/file_systems/userlandfs/server/UserFileSystem.cpp delete mode 100644 src/add-ons/kernel/file_systems/userlandfs/server/UserFileSystem.h rename src/add-ons/kernel/file_systems/userlandfs/server/{UserVolume.cpp => Volume.cpp} (52%) rename src/add-ons/kernel/file_systems/userlandfs/server/{UserVolume.h => Volume.h} (93%) diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/BeOSKernelFileSystem.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/BeOSKernelFileSystem.cpp new file mode 100644 index 0000000000..81851ca3d3 --- /dev/null +++ b/src/add-ons/kernel/file_systems/userlandfs/server/BeOSKernelFileSystem.cpp @@ -0,0 +1,45 @@ +// BeOSKernelFileSystem.cpp + +#include + +#include "BeOSKernelFileSystem.h" +#include "BeOSKernelVolume.h" + +// constructor +BeOSKernelFileSystem::BeOSKernelFileSystem(vnode_ops* fsOps) + : FileSystem(), + fFSOps(fsOps) +{ +} + +// destructor +BeOSKernelFileSystem::~BeOSKernelFileSystem() +{ +} + +// CreateVolume +status_t +BeOSKernelFileSystem::CreateVolume(Volume** volume, nspace_id id) +{ + // check initialization and parameters + if (!fFSOps) + return B_BAD_VALUE; + if (!volume) + return B_BAD_VALUE; + // create the volume + *volume = new(nothrow) BeOSKernelVolume(this, id, fFSOps); + if (!*volume) + return B_NO_MEMORY; + return B_OK; +} + +// DeleteVolume +status_t +BeOSKernelFileSystem::DeleteVolume(Volume* volume) +{ + if (!volume || !dynamic_cast(volume)) + return B_BAD_VALUE; + delete volume; + return B_OK; +} + diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/BeOSKernelFileSystem.h b/src/add-ons/kernel/file_systems/userlandfs/server/BeOSKernelFileSystem.h new file mode 100644 index 0000000000..c6dc1c7433 --- /dev/null +++ b/src/add-ons/kernel/file_systems/userlandfs/server/BeOSKernelFileSystem.h @@ -0,0 +1,26 @@ +// BeOSKernelFileSystem.h + +#ifndef USERLAND_FS_BEOS_KERNEL_FILE_SYSTEM_H +#define USERLAND_FS_BEOS_KERNEL_FILE_SYSTEM_H + +#include "FileSystem.h" + +namespace UserlandFS { + +class BeOSKernelFileSystem : public FileSystem { +public: + BeOSKernelFileSystem(vnode_ops* fsOps); + virtual ~BeOSKernelFileSystem(); + + virtual status_t CreateVolume(Volume** volume, nspace_id id); + virtual status_t DeleteVolume(Volume* volume); + +private: + vnode_ops* fFSOps; +}; + +} // namespace UserlandFS + +using UserlandFS::BeOSKernelFileSystem; + +#endif // USERLAND_FS_BEOS_KERNEL_FILE_SYSTEM_H diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/KernelUserVolume.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/BeOSKernelVolume.cpp similarity index 73% rename from src/add-ons/kernel/file_systems/userlandfs/server/KernelUserVolume.cpp rename to src/add-ons/kernel/file_systems/userlandfs/server/BeOSKernelVolume.cpp index a83b8adb57..bcef099887 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/KernelUserVolume.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/BeOSKernelVolume.cpp @@ -1,18 +1,18 @@ -// KernelUserVolume.cpp +// BeOSKernelVolume.cpp -#include "KernelUserVolume.h" +#include "BeOSKernelVolume.h" // constructor -KernelUserVolume::KernelUserVolume(UserFileSystem* fileSystem, nspace_id id, +BeOSKernelVolume::BeOSKernelVolume(FileSystem* fileSystem, nspace_id id, vnode_ops* fsOps) - : UserVolume(fileSystem, id), + : Volume(fileSystem, id), fFSOps(fsOps), fVolumeCookie(NULL) { } // destructor -KernelUserVolume::~KernelUserVolume() +BeOSKernelVolume::~BeOSKernelVolume() { } @@ -21,7 +21,7 @@ KernelUserVolume::~KernelUserVolume() // Mount status_t -KernelUserVolume::Mount(const char* device, ulong flags, const char* parameters, +BeOSKernelVolume::Mount(const char* device, ulong flags, const char* parameters, int32 len, vnode_id* rootID) { if (!fFSOps->mount) @@ -32,7 +32,7 @@ KernelUserVolume::Mount(const char* device, ulong flags, const char* parameters, // Unmount status_t -KernelUserVolume::Unmount() +BeOSKernelVolume::Unmount() { if (!fFSOps->unmount) return B_BAD_VALUE; @@ -41,7 +41,7 @@ KernelUserVolume::Unmount() // Sync status_t -KernelUserVolume::Sync() +BeOSKernelVolume::Sync() { if (!fFSOps->sync) return B_BAD_VALUE; @@ -50,7 +50,7 @@ KernelUserVolume::Sync() // ReadFSStat status_t -KernelUserVolume::ReadFSStat(fs_info* info) +BeOSKernelVolume::ReadFSStat(fs_info* info) { if (!fFSOps->rfsstat) return B_BAD_VALUE; @@ -59,7 +59,7 @@ KernelUserVolume::ReadFSStat(fs_info* info) // WriteFSStat status_t -KernelUserVolume::WriteFSStat(struct fs_info *info, long mask) +BeOSKernelVolume::WriteFSStat(struct fs_info *info, long mask) { if (!fFSOps->wfsstat) return B_BAD_VALUE; @@ -71,7 +71,7 @@ KernelUserVolume::WriteFSStat(struct fs_info *info, long mask) // ReadVNode status_t -KernelUserVolume::ReadVNode(vnode_id vnid, char reenter, void** node) +BeOSKernelVolume::ReadVNode(vnode_id vnid, char reenter, void** node) { if (!fFSOps->read_vnode) return B_BAD_VALUE; @@ -80,7 +80,7 @@ KernelUserVolume::ReadVNode(vnode_id vnid, char reenter, void** node) // WriteVNode status_t -KernelUserVolume::WriteVNode(void* node, char reenter) +BeOSKernelVolume::WriteVNode(void* node, char reenter) { if (!fFSOps->write_vnode) return B_BAD_VALUE; @@ -89,7 +89,7 @@ KernelUserVolume::WriteVNode(void* node, char reenter) // RemoveVNode status_t -KernelUserVolume::RemoveVNode(void* node, char reenter) +BeOSKernelVolume::RemoveVNode(void* node, char reenter) { if (!fFSOps->remove_vnode) return B_BAD_VALUE; @@ -101,7 +101,7 @@ KernelUserVolume::RemoveVNode(void* node, char reenter) // FSync status_t -KernelUserVolume::FSync(void* node) +BeOSKernelVolume::FSync(void* node) { if (!fFSOps->fsync) return B_BAD_VALUE; @@ -110,7 +110,7 @@ KernelUserVolume::FSync(void* node) // ReadStat status_t -KernelUserVolume::ReadStat(void* node, struct stat* st) +BeOSKernelVolume::ReadStat(void* node, struct stat* st) { if (!fFSOps->rstat) return B_BAD_VALUE; @@ -119,7 +119,7 @@ KernelUserVolume::ReadStat(void* node, struct stat* st) // WriteStat status_t -KernelUserVolume::WriteStat(void* node, struct stat* st, long mask) +BeOSKernelVolume::WriteStat(void* node, struct stat* st, long mask) { if (!fFSOps->wstat) return B_BAD_VALUE; @@ -128,7 +128,7 @@ KernelUserVolume::WriteStat(void* node, struct stat* st, long mask) // Access status_t -KernelUserVolume::Access(void* node, int mode) +BeOSKernelVolume::Access(void* node, int mode) { if (!fFSOps->access) return B_BAD_VALUE; @@ -140,7 +140,7 @@ KernelUserVolume::Access(void* node, int mode) // Create status_t -KernelUserVolume::Create(void* dir, const char* name, int openMode, int mode, +BeOSKernelVolume::Create(void* dir, const char* name, int openMode, int mode, vnode_id* vnid, void** cookie) { if (!fFSOps->create) @@ -151,7 +151,7 @@ KernelUserVolume::Create(void* dir, const char* name, int openMode, int mode, // Open status_t -KernelUserVolume::Open(void* node, int openMode, void** cookie) +BeOSKernelVolume::Open(void* node, int openMode, void** cookie) { if (!fFSOps->open) return B_BAD_VALUE; @@ -160,7 +160,7 @@ KernelUserVolume::Open(void* node, int openMode, void** cookie) // Close status_t -KernelUserVolume::Close(void* node, void* cookie) +BeOSKernelVolume::Close(void* node, void* cookie) { if (!fFSOps->close) return B_OK; @@ -169,7 +169,7 @@ KernelUserVolume::Close(void* node, void* cookie) // FreeCookie status_t -KernelUserVolume::FreeCookie(void* node, void* cookie) +BeOSKernelVolume::FreeCookie(void* node, void* cookie) { if (!fFSOps->free_cookie) return B_OK; @@ -178,7 +178,7 @@ KernelUserVolume::FreeCookie(void* node, void* cookie) // Read status_t -KernelUserVolume::Read(void* node, void* cookie, off_t pos, void* buffer, +BeOSKernelVolume::Read(void* node, void* cookie, off_t pos, void* buffer, size_t bufferSize, size_t* bytesRead) { if (!fFSOps->read) @@ -189,7 +189,7 @@ KernelUserVolume::Read(void* node, void* cookie, off_t pos, void* buffer, // Write status_t -KernelUserVolume::Write(void* node, void* cookie, off_t pos, const void* buffer, +BeOSKernelVolume::Write(void* node, void* cookie, off_t pos, const void* buffer, size_t bufferSize, size_t* bytesWritten) { if (!fFSOps->write) @@ -201,7 +201,7 @@ KernelUserVolume::Write(void* node, void* cookie, off_t pos, const void* buffer, // IOCtl status_t -KernelUserVolume::IOCtl(void* node, void* cookie, int command, void *buffer, +BeOSKernelVolume::IOCtl(void* node, void* cookie, int command, void *buffer, size_t size) { if (!fFSOps->ioctl) @@ -211,7 +211,7 @@ KernelUserVolume::IOCtl(void* node, void* cookie, int command, void *buffer, // SetFlags status_t -KernelUserVolume::SetFlags(void* node, void* cookie, int flags) +BeOSKernelVolume::SetFlags(void* node, void* cookie, int flags) { if (!fFSOps->setflags) return B_BAD_VALUE; @@ -220,7 +220,7 @@ KernelUserVolume::SetFlags(void* node, void* cookie, int flags) // Select status_t -KernelUserVolume::Select(void* node, void* cookie, uint8 event, uint32 ref, +BeOSKernelVolume::Select(void* node, void* cookie, uint8 event, uint32 ref, selectsync* sync) { if (!fFSOps->select) { @@ -232,7 +232,7 @@ KernelUserVolume::Select(void* node, void* cookie, uint8 event, uint32 ref, // Deselect status_t -KernelUserVolume::Deselect(void* node, void* cookie, uint8 event, +BeOSKernelVolume::Deselect(void* node, void* cookie, uint8 event, selectsync* sync) { if (!fFSOps->select || !fFSOps->deselect) @@ -245,7 +245,7 @@ KernelUserVolume::Deselect(void* node, void* cookie, uint8 event, // Link status_t -KernelUserVolume::Link(void* dir, const char* name, void* node) +BeOSKernelVolume::Link(void* dir, const char* name, void* node) { if (!fFSOps->link) return B_BAD_VALUE; @@ -254,7 +254,7 @@ KernelUserVolume::Link(void* dir, const char* name, void* node) // Unlink status_t -KernelUserVolume::Unlink(void* dir, const char* name) +BeOSKernelVolume::Unlink(void* dir, const char* name) { if (!fFSOps->unlink) return B_BAD_VALUE; @@ -263,7 +263,7 @@ KernelUserVolume::Unlink(void* dir, const char* name) // Symlink status_t -KernelUserVolume::Symlink(void* dir, const char* name, const char* target) +BeOSKernelVolume::Symlink(void* dir, const char* name, const char* target) { if (!fFSOps->symlink) return B_BAD_VALUE; @@ -272,7 +272,7 @@ KernelUserVolume::Symlink(void* dir, const char* name, const char* target) // ReadLink status_t -KernelUserVolume::ReadLink(void* node, char* buffer, size_t bufferSize, +BeOSKernelVolume::ReadLink(void* node, char* buffer, size_t bufferSize, size_t* bytesRead) { if (!fFSOps->readlink) @@ -283,7 +283,7 @@ KernelUserVolume::ReadLink(void* node, char* buffer, size_t bufferSize, // Rename status_t -KernelUserVolume::Rename(void* oldDir, const char* oldName, void* newDir, +BeOSKernelVolume::Rename(void* oldDir, const char* oldName, void* newDir, const char* newName) { if (!fFSOps->rename) @@ -296,7 +296,7 @@ KernelUserVolume::Rename(void* oldDir, const char* oldName, void* newDir, // MkDir status_t -KernelUserVolume::MkDir(void* dir, const char* name, int mode) +BeOSKernelVolume::MkDir(void* dir, const char* name, int mode) { if (!fFSOps->mkdir) return B_BAD_VALUE; @@ -305,7 +305,7 @@ KernelUserVolume::MkDir(void* dir, const char* name, int mode) // RmDir status_t -KernelUserVolume::RmDir(void* dir, const char* name) +BeOSKernelVolume::RmDir(void* dir, const char* name) { if (!fFSOps->rmdir) return B_BAD_VALUE; @@ -314,7 +314,7 @@ KernelUserVolume::RmDir(void* dir, const char* name) // OpenDir status_t -KernelUserVolume::OpenDir(void* node, void** cookie) +BeOSKernelVolume::OpenDir(void* node, void** cookie) { if (!fFSOps->opendir) return B_BAD_VALUE; @@ -323,7 +323,7 @@ KernelUserVolume::OpenDir(void* node, void** cookie) // CloseDir status_t -KernelUserVolume::CloseDir(void* node, void* cookie) +BeOSKernelVolume::CloseDir(void* node, void* cookie) { if (!fFSOps->closedir) return B_OK; @@ -332,7 +332,7 @@ KernelUserVolume::CloseDir(void* node, void* cookie) // FreeDirCookie status_t -KernelUserVolume::FreeDirCookie(void* node, void* cookie) +BeOSKernelVolume::FreeDirCookie(void* node, void* cookie) { if (!fFSOps->free_dircookie) return B_OK; @@ -341,7 +341,7 @@ KernelUserVolume::FreeDirCookie(void* node, void* cookie) // ReadDir status_t -KernelUserVolume::ReadDir(void* node, void* cookie, void* buffer, +BeOSKernelVolume::ReadDir(void* node, void* cookie, void* buffer, size_t bufferSize, int32 count, int32* countRead) { if (!fFSOps->readdir) @@ -353,7 +353,7 @@ KernelUserVolume::ReadDir(void* node, void* cookie, void* buffer, // RewindDir status_t -KernelUserVolume::RewindDir(void* node, void* cookie) +BeOSKernelVolume::RewindDir(void* node, void* cookie) { if (!fFSOps->rewinddir) return B_BAD_VALUE; @@ -362,7 +362,7 @@ KernelUserVolume::RewindDir(void* node, void* cookie) // Walk status_t -KernelUserVolume::Walk(void* dir, const char* entryName, char** resolvedPath, +BeOSKernelVolume::Walk(void* dir, const char* entryName, char** resolvedPath, vnode_id* vnid) { if (!fFSOps->walk) @@ -375,7 +375,7 @@ KernelUserVolume::Walk(void* dir, const char* entryName, char** resolvedPath, // OpenAttrDir status_t -KernelUserVolume::OpenAttrDir(void* node, void** cookie) +BeOSKernelVolume::OpenAttrDir(void* node, void** cookie) { if (!fFSOps->open_attrdir) return B_BAD_VALUE; @@ -384,7 +384,7 @@ KernelUserVolume::OpenAttrDir(void* node, void** cookie) // CloseAttrDir status_t -KernelUserVolume::CloseAttrDir(void* node, void* cookie) +BeOSKernelVolume::CloseAttrDir(void* node, void* cookie) { if (!fFSOps->close_attrdir) return B_OK; @@ -393,7 +393,7 @@ KernelUserVolume::CloseAttrDir(void* node, void* cookie) // FreeAttrDirCookie status_t -KernelUserVolume::FreeAttrDirCookie(void* node, void* cookie) +BeOSKernelVolume::FreeAttrDirCookie(void* node, void* cookie) { if (!fFSOps->free_attrdircookie) return B_OK; @@ -402,7 +402,7 @@ KernelUserVolume::FreeAttrDirCookie(void* node, void* cookie) // ReadAttrDir status_t -KernelUserVolume::ReadAttrDir(void* node, void* cookie, void* buffer, +BeOSKernelVolume::ReadAttrDir(void* node, void* cookie, void* buffer, size_t bufferSize, int32 count, int32* countRead) { if (!fFSOps->read_attrdir) @@ -414,7 +414,7 @@ KernelUserVolume::ReadAttrDir(void* node, void* cookie, void* buffer, // RewindAttrDir status_t -KernelUserVolume::RewindAttrDir(void* node, void* cookie) +BeOSKernelVolume::RewindAttrDir(void* node, void* cookie) { if (!fFSOps->rewind_attrdir) return B_BAD_VALUE; @@ -423,7 +423,7 @@ KernelUserVolume::RewindAttrDir(void* node, void* cookie) // ReadAttr status_t -KernelUserVolume::ReadAttr(void* node, const char* name, int type, off_t pos, +BeOSKernelVolume::ReadAttr(void* node, const char* name, int type, off_t pos, void* buffer, size_t bufferSize, size_t* bytesRead) { if (!fFSOps->read_attr) @@ -435,7 +435,7 @@ KernelUserVolume::ReadAttr(void* node, const char* name, int type, off_t pos, // WriteAttr status_t -KernelUserVolume::WriteAttr(void* node, const char* name, int type, off_t pos, +BeOSKernelVolume::WriteAttr(void* node, const char* name, int type, off_t pos, const void* buffer, size_t bufferSize, size_t* bytesWritten) { if (!fFSOps->write_attr) @@ -447,7 +447,7 @@ KernelUserVolume::WriteAttr(void* node, const char* name, int type, off_t pos, // RemoveAttr status_t -KernelUserVolume::RemoveAttr(void* node, const char* name) +BeOSKernelVolume::RemoveAttr(void* node, const char* name) { if (!fFSOps->remove_attr) return B_BAD_VALUE; @@ -456,7 +456,7 @@ KernelUserVolume::RemoveAttr(void* node, const char* name) // RenameAttr status_t -KernelUserVolume::RenameAttr(void* node, const char* oldName, const char* newName) +BeOSKernelVolume::RenameAttr(void* node, const char* oldName, const char* newName) { if (!fFSOps->rename_attr) return B_BAD_VALUE; @@ -465,7 +465,7 @@ KernelUserVolume::RenameAttr(void* node, const char* oldName, const char* newNam // StatAttr status_t -KernelUserVolume::StatAttr(void* node, const char* name, +BeOSKernelVolume::StatAttr(void* node, const char* name, struct attr_info* attrInfo) { if (!fFSOps->stat_attr) @@ -478,7 +478,7 @@ KernelUserVolume::StatAttr(void* node, const char* name, // OpenIndexDir status_t -KernelUserVolume::OpenIndexDir(void** cookie) +BeOSKernelVolume::OpenIndexDir(void** cookie) { if (!fFSOps->open_indexdir) return B_BAD_VALUE; @@ -487,7 +487,7 @@ KernelUserVolume::OpenIndexDir(void** cookie) // CloseIndexDir status_t -KernelUserVolume::CloseIndexDir(void* cookie) +BeOSKernelVolume::CloseIndexDir(void* cookie) { if (!fFSOps->close_indexdir) return B_OK; @@ -496,7 +496,7 @@ KernelUserVolume::CloseIndexDir(void* cookie) // FreeIndexDirCookie status_t -KernelUserVolume::FreeIndexDirCookie(void* cookie) +BeOSKernelVolume::FreeIndexDirCookie(void* cookie) { if (!fFSOps->free_indexdircookie) return B_OK; @@ -505,7 +505,7 @@ KernelUserVolume::FreeIndexDirCookie(void* cookie) // ReadIndexDir status_t -KernelUserVolume::ReadIndexDir(void* cookie, void* buffer, size_t bufferSize, +BeOSKernelVolume::ReadIndexDir(void* cookie, void* buffer, size_t bufferSize, int32 count, int32* countRead) { if (!fFSOps->read_indexdir) @@ -517,7 +517,7 @@ KernelUserVolume::ReadIndexDir(void* cookie, void* buffer, size_t bufferSize, // RewindIndexDir status_t -KernelUserVolume::RewindIndexDir(void* cookie) +BeOSKernelVolume::RewindIndexDir(void* cookie) { if (!fFSOps->rewind_indexdir) return B_BAD_VALUE; @@ -526,7 +526,7 @@ KernelUserVolume::RewindIndexDir(void* cookie) // CreateIndex status_t -KernelUserVolume::CreateIndex(const char* name, int type, int flags) +BeOSKernelVolume::CreateIndex(const char* name, int type, int flags) { if (!fFSOps->create_index) return B_BAD_VALUE; @@ -535,7 +535,7 @@ KernelUserVolume::CreateIndex(const char* name, int type, int flags) // RemoveIndex status_t -KernelUserVolume::RemoveIndex(const char* name) +BeOSKernelVolume::RemoveIndex(const char* name) { if (!fFSOps->remove_index) return B_BAD_VALUE; @@ -544,7 +544,7 @@ KernelUserVolume::RemoveIndex(const char* name) // RenameIndex status_t -KernelUserVolume::RenameIndex(const char* oldName, const char* newName) +BeOSKernelVolume::RenameIndex(const char* oldName, const char* newName) { if (!fFSOps->rename_index) return B_BAD_VALUE; @@ -553,7 +553,7 @@ KernelUserVolume::RenameIndex(const char* oldName, const char* newName) // StatIndex status_t -KernelUserVolume::StatIndex(const char *name, struct index_info* indexInfo) +BeOSKernelVolume::StatIndex(const char *name, struct index_info* indexInfo) { if (!fFSOps->stat_index) return B_BAD_VALUE; @@ -565,7 +565,7 @@ KernelUserVolume::StatIndex(const char *name, struct index_info* indexInfo) // OpenQuery status_t -KernelUserVolume::OpenQuery(const char* queryString, ulong flags, port_id port, +BeOSKernelVolume::OpenQuery(const char* queryString, ulong flags, port_id port, long token, void** cookie) { if (!fFSOps->open_query) @@ -576,7 +576,7 @@ KernelUserVolume::OpenQuery(const char* queryString, ulong flags, port_id port, // CloseQuery status_t -KernelUserVolume::CloseQuery(void* cookie) +BeOSKernelVolume::CloseQuery(void* cookie) { if (!fFSOps->close_query) return B_OK; @@ -585,7 +585,7 @@ KernelUserVolume::CloseQuery(void* cookie) // FreeQueryCookie status_t -KernelUserVolume::FreeQueryCookie(void* cookie) +BeOSKernelVolume::FreeQueryCookie(void* cookie) { if (!fFSOps->free_querycookie) return B_OK; @@ -594,7 +594,7 @@ KernelUserVolume::FreeQueryCookie(void* cookie) // ReadQuery status_t -KernelUserVolume::ReadQuery(void* cookie, void* buffer, size_t bufferSize, +BeOSKernelVolume::ReadQuery(void* cookie, void* buffer, size_t bufferSize, int32 count, int32* countRead) { if (!fFSOps->read_query) diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/KernelUserVolume.h b/src/add-ons/kernel/file_systems/userlandfs/server/BeOSKernelVolume.h similarity index 93% rename from src/add-ons/kernel/file_systems/userlandfs/server/KernelUserVolume.h rename to src/add-ons/kernel/file_systems/userlandfs/server/BeOSKernelVolume.h index 8f6d60f304..3add04a50a 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/KernelUserVolume.h +++ b/src/add-ons/kernel/file_systems/userlandfs/server/BeOSKernelVolume.h @@ -1,19 +1,19 @@ -// KernelUserVolume.h +// BeOSKernelVolume.h -#ifndef USERLAND_FS_KERNEL_FS_VOLUME_H -#define USERLAND_FS_KERNEL_FS_VOLUME_H +#ifndef USERLAND_FS_BEOS_KERNEL_VOLUME_H +#define USERLAND_FS_BEOS_KERNEL_VOLUME_H -#include "UserVolume.h" +#include "Volume.h" struct vnode_ops; namespace UserlandFS { -class KernelUserVolume : public UserVolume { +class BeOSKernelVolume : public Volume { public: - KernelUserVolume(UserFileSystem* fileSystem, + BeOSKernelVolume(FileSystem* fileSystem, nspace_id id, vnode_ops* fsOps); - virtual ~KernelUserVolume(); + virtual ~BeOSKernelVolume(); // FS virtual status_t Mount(const char* device, ulong flags, @@ -134,6 +134,6 @@ private: } // namespace UserlandFS -using UserlandFS::KernelUserVolume; +using UserlandFS::BeOSKernelVolume; -#endif // USERLAND_FS_KERNEL_FS_VOLUME_H +#endif // USERLAND_FS_BEOS_KERNEL_VOLUME_H diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/DispatcherFileSystem.h b/src/add-ons/kernel/file_systems/userlandfs/server/DispatcherFileSystem.h index 356462db31..e0590f7f8d 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/DispatcherFileSystem.h +++ b/src/add-ons/kernel/file_systems/userlandfs/server/DispatcherFileSystem.h @@ -1,7 +1,7 @@ // FileSystem.h -#ifndef USERLAND_FS_FILE_SYSTEM_H -#define USERLAND_FS_FILE_SYSTEM_H +#ifndef USERLAND_FS_DISPATCHER_FILE_SYSTEM_H +#define USERLAND_FS_DISPATCHER_FILE_SYSTEM_H #include @@ -45,4 +45,4 @@ private: using UserlandFS::Dispatcher::FileSystem; -#endif // USERLAND_FS_FILE_SYSTEM_H +#endif // USERLAND_FS_DISPATCHER_FILE_SYSTEM_H diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.cpp new file mode 100644 index 0000000000..5d86e25f7a --- /dev/null +++ b/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.cpp @@ -0,0 +1,14 @@ +// FileSystem.cpp + +#include "FileSystem.h" + +// constructor +FileSystem::FileSystem() +{ +} + +// destructor +FileSystem::~FileSystem() +{ +} + diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.h b/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.h new file mode 100644 index 0000000000..e652d7172c --- /dev/null +++ b/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.h @@ -0,0 +1,27 @@ +// FileSystem.h + +#ifndef USERLAND_FS_FILE_SYSTEM_H +#define USERLAND_FS_FILE_SYSTEM_H + +#include +#include + +namespace UserlandFS { + +class Volume; + +class FileSystem { +public: + FileSystem(); + virtual ~FileSystem(); + + virtual status_t CreateVolume(Volume** volume, + nspace_id id) = 0; + virtual status_t DeleteVolume(Volume* volume) = 0; +}; + +} // namespace UserlandFS + +using UserlandFS::FileSystem; + +#endif // USERLAND_FS_FILE_SYSTEM_H diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/Jamfile b/src/add-ons/kernel/file_systems/userlandfs/server/Jamfile index 39812affb6..87eef99fa4 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/Jamfile +++ b/src/add-ons/kernel/file_systems/userlandfs/server/Jamfile @@ -1,23 +1,20 @@ -SubDir HAIKU_TOP src tests add-ons kernel file_systems userlandfs r5 src - server ; +SubDir HAIKU_TOP src add-ons kernel file_systems userlandfs server ; -SetSubDirSupportedPlatforms r5 bone dano ; +local userlandFSTop = [ FDirName $(HAIKU_TOP) src add-ons kernel + file_systems userlandfs ] ; +local userlandFSIncludes = [ PrivateHeaders userlandfs ] ; -local userlandFSTop = [ FDirName $(HAIKU_TOP) src tests add-ons kernel - file_systems userlandfs r5 ] ; -local userlandFSIncludes = [ FDirName $(userlandFSTop) headers ] ; - -SubDirSysHdrs [ FDirName $(userlandFSIncludes) public ] ; +#SubDirSysHdrs [ FDirName $(userlandFSIncludes) legacy ] ; SubDirHdrs [ FDirName $(userlandFSIncludes) private ] ; SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ; -SEARCH_SOURCE += [ FDirName $(userlandFSTop) src private ] ; -SEARCH_SOURCE += [ FDirName $(userlandFSTop) src shared ] ; +SEARCH_SOURCE += [ FDirName $(userlandFSTop) private ] ; +SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ; DEFINES += USER=1 ; DEFINES += DEBUG_APP="\\\"UserlandFSServer\\\"" ; -Application UserlandFSServer +Application UserlandFSServer : AreaSupport.cpp Debug.cpp DispatcherDefs.cpp @@ -35,20 +32,20 @@ Application UserlandFSServer SingleReplyRequestHandler.cpp String.cpp - cache.c - sysdep.c +# cache.c +# sysdep.c - FileSystem.cpp - kernel_emu.cpp - KernelUserFileSystem.cpp - KernelUserVolume.cpp +# BeOSKernelFileSystem.cpp +# BeOSKernelVolume.cpp + DispatcherFileSystem.cpp +# FileSystem.cpp +# kernel_emu.cpp main.cpp - RequestThread.cpp +# RequestThread.cpp ServerDefs.cpp - UserFileSystem.cpp UserlandFSDispatcher.cpp - UserlandFSServer.cpp - UserlandRequestHandler.cpp - UserVolume.cpp +# UserlandFSServer.cpp +# UserlandRequestHandler.cpp +# Volume.cpp : be ; diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/KernelUserFileSystem.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/KernelUserFileSystem.cpp deleted file mode 100644 index e7635dcd33..0000000000 --- a/src/add-ons/kernel/file_systems/userlandfs/server/KernelUserFileSystem.cpp +++ /dev/null @@ -1,45 +0,0 @@ -// KernelUserFileSystem.cpp - -#include - -#include "KernelUserFileSystem.h" -#include "KernelUserVolume.h" - -// constructor -KernelUserFileSystem::KernelUserFileSystem(vnode_ops* fsOps) - : UserFileSystem(), - fFSOps(fsOps) -{ -} - -// destructor -KernelUserFileSystem::~KernelUserFileSystem() -{ -} - -// CreateVolume -status_t -KernelUserFileSystem::CreateVolume(UserVolume** volume, nspace_id id) -{ - // check initialization and parameters - if (!fFSOps) - return B_BAD_VALUE; - if (!volume) - return B_BAD_VALUE; - // create the volume - *volume = new(nothrow) KernelUserVolume(this, id, fFSOps); - if (!*volume) - return B_NO_MEMORY; - return B_OK; -} - -// DeleteVolume -status_t -KernelUserFileSystem::DeleteVolume(UserVolume* volume) -{ - if (!volume || !dynamic_cast(volume)) - return B_BAD_VALUE; - delete volume; - return B_OK; -} - diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/KernelUserFileSystem.h b/src/add-ons/kernel/file_systems/userlandfs/server/KernelUserFileSystem.h deleted file mode 100644 index abe9d40aab..0000000000 --- a/src/add-ons/kernel/file_systems/userlandfs/server/KernelUserFileSystem.h +++ /dev/null @@ -1,26 +0,0 @@ -// KernelUserFileSystem.h - -#ifndef USERLAND_FS_KERNEL_USER_FILE_SYSTEM_H -#define USERLAND_FS_KERNEL_USER_FILE_SYSTEM_H - -#include "UserFileSystem.h" - -namespace UserlandFS { - -class KernelUserFileSystem : public UserFileSystem { -public: - KernelUserFileSystem(vnode_ops* fsOps); - virtual ~KernelUserFileSystem(); - - virtual status_t CreateVolume(UserVolume** volume, nspace_id id); - virtual status_t DeleteVolume(UserVolume* volume); - -private: - vnode_ops* fFSOps; -}; - -} // namespace UserlandFS - -using UserlandFS::KernelUserFileSystem; - -#endif // USERLAND_FS_KERNEL_USER_FILE_SYSTEM_H diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/RequestThread.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/RequestThread.cpp index cd069b7204..ba9a4dbdd9 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/RequestThread.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/RequestThread.cpp @@ -11,7 +11,7 @@ static const int32 sTLSVariable = tls_allocate(); // constructor -RequestThreadContext::RequestThreadContext(UserVolume* volume) +RequestThreadContext::RequestThreadContext(Volume* volume) : fPreviousContext(NULL), fThread(NULL), fVolume(volume) @@ -38,7 +38,7 @@ RequestThreadContext::GetThread() const } // GetVolume -UserlandFS::UserVolume* +UserlandFS::Volume* RequestThreadContext::GetVolume() const { return fVolume; @@ -67,7 +67,7 @@ RequestThread::~RequestThread() // Init status_t -RequestThread::Init(UserFileSystem* fileSystem) +RequestThread::Init(FileSystem* fileSystem) { if (!fileSystem) return B_BAD_VALUE; @@ -124,7 +124,7 @@ RequestThread::GetPortInfo() const } // GetFileSystem -UserlandFS::UserFileSystem* +UserlandFS::FileSystem* RequestThread::GetFileSystem() const { return fFileSystem; diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/RequestThread.h b/src/add-ons/kernel/file_systems/userlandfs/server/RequestThread.h index c1522b6f9c..28dd82a1ee 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/RequestThread.h +++ b/src/add-ons/kernel/file_systems/userlandfs/server/RequestThread.h @@ -7,23 +7,23 @@ namespace UserlandFS { +class FileSystem; class RequestThread; -class UserFileSystem; -class UserVolume; +class Volume; // RequestThreadContext class RequestThreadContext { public: - RequestThreadContext(UserVolume* volume); + RequestThreadContext(Volume* volume); ~RequestThreadContext(); RequestThread* GetThread() const; - UserVolume* GetVolume() const; + Volume* GetVolume() const; private: RequestThreadContext* fPreviousContext; RequestThread* fThread; - UserVolume* fVolume; + Volume* fVolume; }; // RequestThread @@ -32,13 +32,13 @@ public: RequestThread(); ~RequestThread(); - status_t Init(UserFileSystem* fileSystem); + status_t Init(FileSystem* fileSystem); void Run(); void PrepareTermination(); void Terminate(); const Port::Info* GetPortInfo() const; - UserFileSystem* GetFileSystem() const; + FileSystem* GetFileSystem() const; RequestPort* GetPort() const; RequestThreadContext* GetContext() const; @@ -55,7 +55,7 @@ private: friend class RequestThreadContext; thread_id fThread; - UserFileSystem* fFileSystem; + FileSystem* fFileSystem; RequestPort* fPort; RequestThreadContext* fContext; bool fTerminating; diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/UserFileSystem.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/UserFileSystem.cpp deleted file mode 100644 index e709615616..0000000000 --- a/src/add-ons/kernel/file_systems/userlandfs/server/UserFileSystem.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// UserFileSystem.cpp - -#include "UserFileSystem.h" - -// constructor -UserFileSystem::UserFileSystem() -{ -} - -// destructor -UserFileSystem::~UserFileSystem() -{ -} - diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/UserFileSystem.h b/src/add-ons/kernel/file_systems/userlandfs/server/UserFileSystem.h deleted file mode 100644 index af158db180..0000000000 --- a/src/add-ons/kernel/file_systems/userlandfs/server/UserFileSystem.h +++ /dev/null @@ -1,27 +0,0 @@ -// UserFileSystem.h - -#ifndef USERLAND_FS_USER_FILE_SYSTEM_H -#define USERLAND_FS_USER_FILE_SYSTEM_H - -#include -#include - -namespace UserlandFS { - -class UserVolume; - -class UserFileSystem { -public: - UserFileSystem(); - virtual ~UserFileSystem(); - - virtual status_t CreateVolume(UserVolume** volume, - nspace_id id) = 0; - virtual status_t DeleteVolume(UserVolume* volume) = 0; -}; - -} // namespace UserlandFS - -using UserlandFS::UserFileSystem; - -#endif // USERLAND_FS_FILE_SYSTEM_H diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSServer.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSServer.cpp index 95348b3c82..65c564ebe5 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSServer.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSServer.cpp @@ -14,14 +14,14 @@ #include #include "AutoLocker.h" +#include "BeOSKernelFileSystem.h" #include "Compatibility.h" #include "Debug.h" #include "DispatcherDefs.h" +#include "FileSystem.h" #include "FSInfo.h" -#include "KernelUserFileSystem.h" #include "RequestThread.h" #include "ServerDefs.h" -#include "UserFileSystem.h" #include "UserlandFSServer.h" static const int32 kRequestThreadCount = 10; @@ -91,7 +91,7 @@ UserlandFSServer::Init(const char* fileSystem) if (*apiVersion != B_CUR_FS_API_VERSION) RETURN_ERROR(B_ERROR); // create the file system - fFileSystem = new(nothrow) KernelUserFileSystem(fsOps); + fFileSystem = new(nothrow) BeOSKernelFileSystem(fsOps); if (!fileSystem) RETURN_ERROR(B_NO_MEMORY); // init the block cache @@ -136,7 +136,7 @@ UserlandFSServer::GetNotificationRequestPort() } // GetFileSystem -UserFileSystem* +FileSystem* UserlandFSServer::GetFileSystem() { if (UserlandFSServer* server = dynamic_cast(be_app)) diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSServer.h b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSServer.h index 946294f0dc..7a4509b950 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSServer.h +++ b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSServer.h @@ -7,8 +7,8 @@ namespace UserlandFS { +class FileSystem; class RequestThread; -class UserFileSystem; class UserlandFSServer : public BApplication { public: @@ -18,13 +18,13 @@ public: status_t Init(const char* fileSystem); static RequestPort* GetNotificationRequestPort(); - static UserFileSystem* GetFileSystem(); + static FileSystem* GetFileSystem(); private: status_t _RegisterWithDispatcher(const char* fsName); private: image_id fAddOnImage; - UserFileSystem* fFileSystem; + FileSystem* fFileSystem; RequestPort* fNotificationRequestPort; RequestThread* fRequestThreads; bool fBlockCacheInitialized; @@ -32,8 +32,8 @@ private: } // namespace UserlandFS +using UserlandFS::FileSystem; using UserlandFS::RequestThread; -using UserlandFS::UserFileSystem; using UserlandFS::UserlandFSServer; #endif // USERLAND_FS_SERVER_H diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp index d5bb43d864..19ccabd951 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp @@ -1,18 +1,19 @@ // UserlandRequestHandler.cpp +#include "UserlandRequestHandler.h" + #include "AutoDeleter.h" #include "Compatibility.h" #include "Debug.h" -#include "UserVolume.h" +#include "FileSystem.h" #include "RequestPort.h" #include "Requests.h" #include "RequestThread.h" #include "SingleReplyRequestHandler.h" -#include "UserFileSystem.h" -#include "UserlandRequestHandler.h" +#include "Volume.h" // constructor -UserlandRequestHandler::UserlandRequestHandler(UserFileSystem* fileSystem) +UserlandRequestHandler::UserlandRequestHandler(FileSystem* fileSystem) : RequestHandler(), fFileSystem(fileSystem), fExpectReply(false), @@ -21,7 +22,7 @@ UserlandRequestHandler::UserlandRequestHandler(UserFileSystem* fileSystem) } // constructor -UserlandRequestHandler::UserlandRequestHandler(UserFileSystem* fileSystem, +UserlandRequestHandler::UserlandRequestHandler(FileSystem* fileSystem, uint32 expectedReply) : RequestHandler(), fFileSystem(fileSystem), @@ -207,7 +208,7 @@ UserlandRequestHandler::_HandleRequest(MountVolumeRequest* request) } // create the volume - UserVolume* volume = NULL; + Volume* volume = NULL; if (result == B_OK) result = fFileSystem->CreateVolume(&volume, request->nsid); @@ -244,7 +245,7 @@ UserlandRequestHandler::_HandleRequest(UnmountVolumeRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -268,7 +269,7 @@ UserlandRequestHandler::_HandleRequest(SyncVolumeRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -292,7 +293,7 @@ UserlandRequestHandler::_HandleRequest(ReadFSStatRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; fs_info info; @@ -318,7 +319,7 @@ UserlandRequestHandler::_HandleRequest(WriteFSStatRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -346,7 +347,7 @@ UserlandRequestHandler::_HandleRequest(ReadVNodeRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; void* node; @@ -372,7 +373,7 @@ UserlandRequestHandler::_HandleRequest(WriteVNodeRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -396,7 +397,7 @@ UserlandRequestHandler::_HandleRequest(FSRemoveVNodeRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -424,7 +425,7 @@ UserlandRequestHandler::_HandleRequest(FSyncRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -448,7 +449,7 @@ UserlandRequestHandler::_HandleRequest(ReadStatRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; struct stat st; @@ -474,7 +475,7 @@ UserlandRequestHandler::_HandleRequest(WriteStatRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -498,7 +499,7 @@ UserlandRequestHandler::_HandleRequest(AccessRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -526,7 +527,7 @@ UserlandRequestHandler::_HandleRequest(CreateRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; vnode_id vnid; @@ -556,7 +557,7 @@ UserlandRequestHandler::_HandleRequest(OpenRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; void* fileCookie; @@ -582,7 +583,7 @@ UserlandRequestHandler::_HandleRequest(CloseRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -606,7 +607,7 @@ UserlandRequestHandler::_HandleRequest(FreeCookieRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -630,7 +631,7 @@ UserlandRequestHandler::_HandleRequest(ReadRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; void* node = request->node; @@ -668,7 +669,7 @@ UserlandRequestHandler::_HandleRequest(WriteRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; size_t bytesWritten; @@ -696,7 +697,7 @@ UserlandRequestHandler::_HandleRequest(IOCtlRequest* request) { // get the request parameters status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; void* buffer = request->bufferParameter; @@ -746,7 +747,7 @@ UserlandRequestHandler::_HandleRequest(SetFlagsRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -771,7 +772,7 @@ UserlandRequestHandler::_HandleRequest(SelectRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -796,7 +797,7 @@ UserlandRequestHandler::_HandleRequest(DeselectRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -825,7 +826,7 @@ UserlandRequestHandler::_HandleRequest(LinkRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -850,7 +851,7 @@ UserlandRequestHandler::_HandleRequest(UnlinkRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -875,7 +876,7 @@ UserlandRequestHandler::_HandleRequest(SymlinkRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -901,7 +902,7 @@ UserlandRequestHandler::_HandleRequest(ReadLinkRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; void* node = request->node; @@ -937,7 +938,7 @@ UserlandRequestHandler::_HandleRequest(RenameRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -967,7 +968,7 @@ UserlandRequestHandler::_HandleRequest(MkDirRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -992,7 +993,7 @@ UserlandRequestHandler::_HandleRequest(RmDirRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1017,7 +1018,7 @@ UserlandRequestHandler::_HandleRequest(OpenDirRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; void* dirCookie; @@ -1043,7 +1044,7 @@ UserlandRequestHandler::_HandleRequest(CloseDirRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1067,7 +1068,7 @@ UserlandRequestHandler::_HandleRequest(FreeDirCookieRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1091,7 +1092,7 @@ UserlandRequestHandler::_HandleRequest(ReadDirRequest* request) { // check the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; void* node = request->node; @@ -1139,7 +1140,7 @@ UserlandRequestHandler::_HandleRequest(RewindDirRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1163,7 +1164,7 @@ UserlandRequestHandler::_HandleRequest(WalkRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; vnode_id vnid; @@ -1199,7 +1200,7 @@ UserlandRequestHandler::_HandleRequest(OpenAttrDirRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; void* attrDirCookie; @@ -1225,7 +1226,7 @@ UserlandRequestHandler::_HandleRequest(CloseAttrDirRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1249,7 +1250,7 @@ UserlandRequestHandler::_HandleRequest(FreeAttrDirCookieRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1274,7 +1275,7 @@ UserlandRequestHandler::_HandleRequest(ReadAttrDirRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; void* node = request->node; @@ -1313,7 +1314,7 @@ UserlandRequestHandler::_HandleRequest(RewindAttrDirRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1337,7 +1338,7 @@ UserlandRequestHandler::_HandleRequest(ReadAttrRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; void* node = request->node; @@ -1375,7 +1376,7 @@ UserlandRequestHandler::_HandleRequest(WriteAttrRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; size_t bytesWritten; @@ -1404,7 +1405,7 @@ UserlandRequestHandler::_HandleRequest(RemoveAttrRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1429,7 +1430,7 @@ UserlandRequestHandler::_HandleRequest(RenameAttrRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1455,7 +1456,7 @@ UserlandRequestHandler::_HandleRequest(StatAttrRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; attr_info info; @@ -1486,7 +1487,7 @@ UserlandRequestHandler::_HandleRequest(OpenIndexDirRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; void* indexDirCookie; @@ -1512,7 +1513,7 @@ UserlandRequestHandler::_HandleRequest(CloseIndexDirRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1536,7 +1537,7 @@ UserlandRequestHandler::_HandleRequest(FreeIndexDirCookieRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1560,7 +1561,7 @@ UserlandRequestHandler::_HandleRequest(ReadIndexDirRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; void* indexDirCookie = request->indexDirCookie; @@ -1598,7 +1599,7 @@ UserlandRequestHandler::_HandleRequest(RewindIndexDirRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1622,7 +1623,7 @@ UserlandRequestHandler::_HandleRequest(CreateIndexRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1647,7 +1648,7 @@ UserlandRequestHandler::_HandleRequest(RemoveIndexRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1671,7 +1672,7 @@ UserlandRequestHandler::_HandleRequest(RenameIndexRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1696,7 +1697,7 @@ UserlandRequestHandler::_HandleRequest(StatIndexRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; index_info info; @@ -1726,7 +1727,7 @@ UserlandRequestHandler::_HandleRequest(OpenQueryRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; void* queryCookie; @@ -1753,7 +1754,7 @@ UserlandRequestHandler::_HandleRequest(CloseQueryRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1777,7 +1778,7 @@ UserlandRequestHandler::_HandleRequest(FreeQueryCookieRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; if (result == B_OK) { @@ -1801,7 +1802,7 @@ UserlandRequestHandler::_HandleRequest(ReadQueryRequest* request) { // check and execute the request status_t result = B_OK; - UserVolume* volume = (UserVolume*)request->volume; + Volume* volume = (Volume*)request->volume; if (!volume) result = B_BAD_VALUE; void* queryCookie = request->queryCookie; diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.h b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.h index 2e2b70920e..e72851f2a3 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.h +++ b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.h @@ -30,14 +30,12 @@ class ReadLinkRequest; namespace UserlandFS { -class UserFileSystem; +class FileSystem; class UserlandRequestHandler : public RequestHandler { public: - UserlandRequestHandler( - UserFileSystem* fileSystem); - UserlandRequestHandler( - UserFileSystem* fileSystem, + UserlandRequestHandler(FileSystem* fileSystem); + UserlandRequestHandler(FileSystem* fileSystem, uint32 expectedReply); virtual ~UserlandRequestHandler(); @@ -126,7 +124,7 @@ private: bool expectsReceipt); private: - UserFileSystem* fFileSystem; + FileSystem* fFileSystem; bool fExpectReply; uint32 fExpectedReply; }; diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/UserVolume.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/Volume.cpp similarity index 52% rename from src/add-ons/kernel/file_systems/userlandfs/server/UserVolume.cpp rename to src/add-ons/kernel/file_systems/userlandfs/server/Volume.cpp index e1f6dd21dc..d18df1fe5d 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/UserVolume.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/Volume.cpp @@ -1,29 +1,29 @@ -// UserVolume.cpp +// Volume.cpp -#include "UserVolume.h" +#include "Volume.h" // constructor -UserVolume::UserVolume(UserFileSystem* fileSystem, nspace_id id) +Volume::Volume(FileSystem* fileSystem, nspace_id id) : fFileSystem(fileSystem), fID(id) { } // destructor -UserVolume::~UserVolume() +Volume::~Volume() { } // GetFileSystem -UserlandFS::UserFileSystem* -UserVolume::GetFileSystem() const +UserlandFS::FileSystem* +Volume::GetFileSystem() const { return fFileSystem; } // GetID nspace_id -UserVolume::GetID() const +Volume::GetID() const { return fID; } @@ -33,7 +33,7 @@ UserVolume::GetID() const // Mount status_t -UserVolume::Mount(const char* device, ulong flags, const char* parameters, +Volume::Mount(const char* device, ulong flags, const char* parameters, int32 len, vnode_id* rootID) { return B_BAD_VALUE; @@ -41,28 +41,28 @@ UserVolume::Mount(const char* device, ulong flags, const char* parameters, // Unmount status_t -UserVolume::Unmount() +Volume::Unmount() { return B_BAD_VALUE; } // Sync status_t -UserVolume::Sync() +Volume::Sync() { return B_BAD_VALUE; } // ReadFSStat status_t -UserVolume::ReadFSStat(fs_info* info) +Volume::ReadFSStat(fs_info* info) { return B_BAD_VALUE; } // WriteFSStat status_t -UserVolume::WriteFSStat(struct fs_info *info, long mask) +Volume::WriteFSStat(struct fs_info *info, long mask) { return B_BAD_VALUE; } @@ -72,21 +72,21 @@ UserVolume::WriteFSStat(struct fs_info *info, long mask) // ReadVNode status_t -UserVolume::ReadVNode(vnode_id vnid, char reenter, void** node) +Volume::ReadVNode(vnode_id vnid, char reenter, void** node) { return B_BAD_VALUE; } // WriteVNode status_t -UserVolume::WriteVNode(void* node, char reenter) +Volume::WriteVNode(void* node, char reenter) { return B_BAD_VALUE; } // RemoveVNode status_t -UserVolume::RemoveVNode(void* node, char reenter) +Volume::RemoveVNode(void* node, char reenter) { return B_BAD_VALUE; } @@ -96,28 +96,28 @@ UserVolume::RemoveVNode(void* node, char reenter) // FSync status_t -UserVolume::FSync(void* node) +Volume::FSync(void* node) { return B_BAD_VALUE; } // ReadStat status_t -UserVolume::ReadStat(void* node, struct stat* st) +Volume::ReadStat(void* node, struct stat* st) { return B_BAD_VALUE; } // WriteStat status_t -UserVolume::WriteStat(void* node, struct stat* st, long mask) +Volume::WriteStat(void* node, struct stat* st, long mask) { return B_BAD_VALUE; } // Access status_t -UserVolume::Access(void* node, int mode) +Volume::Access(void* node, int mode) { return B_BAD_VALUE; } @@ -127,7 +127,7 @@ UserVolume::Access(void* node, int mode) // Create status_t -UserVolume::Create(void* dir, const char* name, int openMode, int mode, +Volume::Create(void* dir, const char* name, int openMode, int mode, vnode_id* vnid, void** cookie) { return B_BAD_VALUE; @@ -135,28 +135,28 @@ UserVolume::Create(void* dir, const char* name, int openMode, int mode, // Open status_t -UserVolume::Open(void* node, int openMode, void** cookie) +Volume::Open(void* node, int openMode, void** cookie) { return B_BAD_VALUE; } // Close status_t -UserVolume::Close(void* node, void* cookie) +Volume::Close(void* node, void* cookie) { return B_BAD_VALUE; } // FreeCookie status_t -UserVolume::FreeCookie(void* node, void* cookie) +Volume::FreeCookie(void* node, void* cookie) { return B_BAD_VALUE; } // Read status_t -UserVolume::Read(void* node, void* cookie, off_t pos, void* buffer, +Volume::Read(void* node, void* cookie, off_t pos, void* buffer, size_t bufferSize, size_t* bytesRead) { return B_BAD_VALUE; @@ -164,7 +164,7 @@ UserVolume::Read(void* node, void* cookie, off_t pos, void* buffer, // Write status_t -UserVolume::Write(void* node, void* cookie, off_t pos, const void* buffer, +Volume::Write(void* node, void* cookie, off_t pos, const void* buffer, size_t bufferSize, size_t* bytesWritten) { return B_BAD_VALUE; @@ -172,7 +172,7 @@ UserVolume::Write(void* node, void* cookie, off_t pos, const void* buffer, // IOCtl status_t -UserVolume::IOCtl(void* node, void* cookie, int command, void *buffer, +Volume::IOCtl(void* node, void* cookie, int command, void *buffer, size_t size) { return B_BAD_VALUE; @@ -180,14 +180,14 @@ UserVolume::IOCtl(void* node, void* cookie, int command, void *buffer, // SetFlags status_t -UserVolume::SetFlags(void* node, void* cookie, int flags) +Volume::SetFlags(void* node, void* cookie, int flags) { return B_BAD_VALUE; } // Select status_t -UserVolume::Select(void* node, void* cookie, uint8 event, uint32 ref, +Volume::Select(void* node, void* cookie, uint8 event, uint32 ref, selectsync* sync) { return B_BAD_VALUE; @@ -195,7 +195,7 @@ UserVolume::Select(void* node, void* cookie, uint8 event, uint32 ref, // Deselect status_t -UserVolume::Deselect(void* node, void* cookie, uint8 event, selectsync* sync) +Volume::Deselect(void* node, void* cookie, uint8 event, selectsync* sync) { return B_BAD_VALUE; } @@ -205,28 +205,28 @@ UserVolume::Deselect(void* node, void* cookie, uint8 event, selectsync* sync) // Link status_t -UserVolume::Link(void* dir, const char* name, void* node) +Volume::Link(void* dir, const char* name, void* node) { return B_BAD_VALUE; } // Unlink status_t -UserVolume::Unlink(void* dir, const char* name) +Volume::Unlink(void* dir, const char* name) { return B_BAD_VALUE; } // Symlink status_t -UserVolume::Symlink(void* dir, const char* name, const char* target) +Volume::Symlink(void* dir, const char* name, const char* target) { return B_BAD_VALUE; } // ReadLink status_t -UserVolume::ReadLink(void* node, char* buffer, size_t bufferSize, +Volume::ReadLink(void* node, char* buffer, size_t bufferSize, size_t* bytesRead) { return B_BAD_VALUE; @@ -234,7 +234,7 @@ UserVolume::ReadLink(void* node, char* buffer, size_t bufferSize, // Rename status_t -UserVolume::Rename(void* oldDir, const char* oldName, void* newDir, +Volume::Rename(void* oldDir, const char* oldName, void* newDir, const char* newName) { return B_BAD_VALUE; @@ -245,42 +245,42 @@ UserVolume::Rename(void* oldDir, const char* oldName, void* newDir, // MkDir status_t -UserVolume::MkDir(void* dir, const char* name, int mode) +Volume::MkDir(void* dir, const char* name, int mode) { return B_BAD_VALUE; } // RmDir status_t -UserVolume::RmDir(void* dir, const char* name) +Volume::RmDir(void* dir, const char* name) { return B_BAD_VALUE; } // OpenDir status_t -UserVolume::OpenDir(void* node, void** cookie) +Volume::OpenDir(void* node, void** cookie) { return B_BAD_VALUE; } // CloseDir status_t -UserVolume::CloseDir(void* node, void* cookie) +Volume::CloseDir(void* node, void* cookie) { return B_BAD_VALUE; } // FreeDirCookie status_t -UserVolume::FreeDirCookie(void* node, void* cookie) +Volume::FreeDirCookie(void* node, void* cookie) { return B_BAD_VALUE; } // ReadDir status_t -UserVolume::ReadDir(void* node, void* cookie, void* buffer, size_t bufferSize, +Volume::ReadDir(void* node, void* cookie, void* buffer, size_t bufferSize, int32 count, int32* countRead) { return B_BAD_VALUE; @@ -288,14 +288,14 @@ UserVolume::ReadDir(void* node, void* cookie, void* buffer, size_t bufferSize, // RewindDir status_t -UserVolume::RewindDir(void* node, void* cookie) +Volume::RewindDir(void* node, void* cookie) { return B_BAD_VALUE; } // Walk status_t -UserVolume::Walk(void* dir, const char* entryName, char** resolvedPath, +Volume::Walk(void* dir, const char* entryName, char** resolvedPath, vnode_id* vnid) { return B_BAD_VALUE; @@ -306,28 +306,28 @@ UserVolume::Walk(void* dir, const char* entryName, char** resolvedPath, // OpenAttrDir status_t -UserVolume::OpenAttrDir(void* node, void** cookie) +Volume::OpenAttrDir(void* node, void** cookie) { return B_BAD_VALUE; } // CloseAttrDir status_t -UserVolume::CloseAttrDir(void* node, void* cookie) +Volume::CloseAttrDir(void* node, void* cookie) { return B_BAD_VALUE; } // FreeAttrDirCookie status_t -UserVolume::FreeAttrDirCookie(void* node, void* cookie) +Volume::FreeAttrDirCookie(void* node, void* cookie) { return B_BAD_VALUE; } // ReadAttrDir status_t -UserVolume::ReadAttrDir(void* node, void* cookie, void* buffer, size_t bufferSize, +Volume::ReadAttrDir(void* node, void* cookie, void* buffer, size_t bufferSize, int32 count, int32* countRead) { return B_BAD_VALUE; @@ -335,14 +335,14 @@ UserVolume::ReadAttrDir(void* node, void* cookie, void* buffer, size_t bufferSiz // RewindAttrDir status_t -UserVolume::RewindAttrDir(void* node, void* cookie) +Volume::RewindAttrDir(void* node, void* cookie) { return B_BAD_VALUE; } // ReadAttr status_t -UserVolume::ReadAttr(void* node, const char* name, int type, off_t pos, +Volume::ReadAttr(void* node, const char* name, int type, off_t pos, void* buffer, size_t bufferSize, size_t* bytesRead) { return B_BAD_VALUE; @@ -350,7 +350,7 @@ UserVolume::ReadAttr(void* node, const char* name, int type, off_t pos, // WriteAttr status_t -UserVolume::WriteAttr(void* node, const char* name, int type, off_t pos, +Volume::WriteAttr(void* node, const char* name, int type, off_t pos, const void* buffer, size_t bufferSize, size_t* bytesWritten) { return B_BAD_VALUE; @@ -358,21 +358,21 @@ UserVolume::WriteAttr(void* node, const char* name, int type, off_t pos, // RemoveAttr status_t -UserVolume::RemoveAttr(void* node, const char* name) +Volume::RemoveAttr(void* node, const char* name) { return B_BAD_VALUE; } // RenameAttr status_t -UserVolume::RenameAttr(void* node, const char* oldName, const char* newName) +Volume::RenameAttr(void* node, const char* oldName, const char* newName) { return B_BAD_VALUE; } // StatAttr status_t -UserVolume::StatAttr(void* node, const char* name, struct attr_info* attrInfo) +Volume::StatAttr(void* node, const char* name, struct attr_info* attrInfo) { return B_BAD_VALUE; } @@ -382,28 +382,28 @@ UserVolume::StatAttr(void* node, const char* name, struct attr_info* attrInfo) // OpenIndexDir status_t -UserVolume::OpenIndexDir(void** cookie) +Volume::OpenIndexDir(void** cookie) { return B_BAD_VALUE; } // CloseIndexDir status_t -UserVolume::CloseIndexDir(void* cookie) +Volume::CloseIndexDir(void* cookie) { return B_BAD_VALUE; } // FreeIndexDirCookie status_t -UserVolume::FreeIndexDirCookie(void* cookie) +Volume::FreeIndexDirCookie(void* cookie) { return B_BAD_VALUE; } // ReadIndexDir status_t -UserVolume::ReadIndexDir(void* cookie, void* buffer, size_t bufferSize, +Volume::ReadIndexDir(void* cookie, void* buffer, size_t bufferSize, int32 count, int32* countRead) { return B_BAD_VALUE; @@ -411,35 +411,35 @@ UserVolume::ReadIndexDir(void* cookie, void* buffer, size_t bufferSize, // RewindIndexDir status_t -UserVolume::RewindIndexDir(void* cookie) +Volume::RewindIndexDir(void* cookie) { return B_BAD_VALUE; } // CreateIndex status_t -UserVolume::CreateIndex(const char* name, int type, int flags) +Volume::CreateIndex(const char* name, int type, int flags) { return B_BAD_VALUE; } // RemoveIndex status_t -UserVolume::RemoveIndex(const char* name) +Volume::RemoveIndex(const char* name) { return B_BAD_VALUE; } // RenameIndex status_t -UserVolume::RenameIndex(const char* oldName, const char* newName) +Volume::RenameIndex(const char* oldName, const char* newName) { return B_BAD_VALUE; } // StatIndex status_t -UserVolume::StatIndex(const char *name, struct index_info* indexInfo) +Volume::StatIndex(const char *name, struct index_info* indexInfo) { return B_BAD_VALUE; } @@ -449,7 +449,7 @@ UserVolume::StatIndex(const char *name, struct index_info* indexInfo) // OpenQuery status_t -UserVolume::OpenQuery(const char* queryString, ulong flags, port_id port, +Volume::OpenQuery(const char* queryString, ulong flags, port_id port, long token, void** cookie) { return B_BAD_VALUE; @@ -457,21 +457,21 @@ UserVolume::OpenQuery(const char* queryString, ulong flags, port_id port, // CloseQuery status_t -UserVolume::CloseQuery(void* cookie) +Volume::CloseQuery(void* cookie) { return B_BAD_VALUE; } // FreeQueryCookie status_t -UserVolume::FreeQueryCookie(void* cookie) +Volume::FreeQueryCookie(void* cookie) { return B_BAD_VALUE; } // ReadQuery status_t -UserVolume::ReadQuery(void* cookie, void* buffer, size_t bufferSize, int32 count, +Volume::ReadQuery(void* cookie, void* buffer, size_t bufferSize, int32 count, int32* countRead) { return B_BAD_VALUE; diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/UserVolume.h b/src/add-ons/kernel/file_systems/userlandfs/server/Volume.h similarity index 93% rename from src/add-ons/kernel/file_systems/userlandfs/server/UserVolume.h rename to src/add-ons/kernel/file_systems/userlandfs/server/Volume.h index 446ceb4386..3e03869467 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/UserVolume.h +++ b/src/add-ons/kernel/file_systems/userlandfs/server/Volume.h @@ -1,22 +1,22 @@ -// UserVolume.h +// Volume.h -#ifndef USERLAND_FS_USER_VOLUME_H -#define USERLAND_FS_USER_VOLUME_H +#ifndef USERLAND_FS_VOLUME_H +#define USERLAND_FS_VOLUME_H #include #include namespace UserlandFS { -class UserFileSystem; +class FileSystem; -class UserVolume { +class Volume { public: - UserVolume(UserFileSystem* fileSystem, + Volume(FileSystem* fileSystem, nspace_id id); - virtual ~UserVolume(); + virtual ~Volume(); - UserFileSystem* GetFileSystem() const; + FileSystem* GetFileSystem() const; nspace_id GetID() const; // FS @@ -132,12 +132,12 @@ public: int32* countRead); protected: - UserFileSystem* fFileSystem; + FileSystem* fFileSystem; nspace_id fID; }; } // namespace UserlandFS -using UserlandFS::UserVolume; +using UserlandFS::Volume; -#endif // USERLAND_FS_USER_VOLUME_H +#endif // USERLAND_FS_VOLUME_H diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp index 4045779094..8b1839a79f 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp @@ -106,7 +106,7 @@ free_path(char *p) // get_port_and_fs static status_t -get_port_and_fs(RequestPort** port, UserFileSystem** fileSystem) +get_port_and_fs(RequestPort** port, FileSystem** fileSystem) { // get the request thread RequestThread* thread = RequestThread::GetCurrentThread(); @@ -129,7 +129,7 @@ notify_listener(int op, nspace_id nsid, vnode_id vnida, vnode_id vnidb, { // get the request port and the file system RequestPort* port; - UserFileSystem* fileSystem; + FileSystem* fileSystem; status_t error = get_port_and_fs(&port, &fileSystem); if (error != B_OK) return error; @@ -166,7 +166,7 @@ notify_select_event(selectsync *sync, uint32 ref) { // get the request port and the file system RequestPort* port; - UserFileSystem* fileSystem; + FileSystem* fileSystem; status_t error = get_port_and_fs(&port, &fileSystem); if (error != B_OK) return; @@ -196,7 +196,7 @@ send_notification(port_id targetPort, long token, ulong what, long op, { // get the request port and the file system RequestPort* port; - UserFileSystem* fileSystem; + FileSystem* fileSystem; status_t error = get_port_and_fs(&port, &fileSystem); if (error != B_OK) return error; @@ -240,7 +240,7 @@ get_vnode(nspace_id nsid, vnode_id vnid, void** data) { // get the request port and the file system RequestPort* port; - UserFileSystem* fileSystem; + FileSystem* fileSystem; status_t error = get_port_and_fs(&port, &fileSystem); if (error != B_OK) return error; @@ -273,7 +273,7 @@ put_vnode(nspace_id nsid, vnode_id vnid) { // get the request port and the file system RequestPort* port; - UserFileSystem* fileSystem; + FileSystem* fileSystem; status_t error = get_port_and_fs(&port, &fileSystem); if (error != B_OK) return error; @@ -305,7 +305,7 @@ new_vnode(nspace_id nsid, vnode_id vnid, void* data) { // get the request port and the file system RequestPort* port; - UserFileSystem* fileSystem; + FileSystem* fileSystem; status_t error = get_port_and_fs(&port, &fileSystem); if (error != B_OK) return error; @@ -338,7 +338,7 @@ remove_vnode(nspace_id nsid, vnode_id vnid) { // get the request port and the file system RequestPort* port; - UserFileSystem* fileSystem; + FileSystem* fileSystem; status_t error = get_port_and_fs(&port, &fileSystem); if (error != B_OK) return error; @@ -370,7 +370,7 @@ unremove_vnode(nspace_id nsid, vnode_id vnid) { // get the request port and the file system RequestPort* port; - UserFileSystem* fileSystem; + FileSystem* fileSystem; status_t error = get_port_and_fs(&port, &fileSystem); if (error != B_OK) return error; @@ -402,7 +402,7 @@ is_vnode_removed(nspace_id nsid, vnode_id vnid) { // get the request port and the file system RequestPort* port; - UserFileSystem* fileSystem; + FileSystem* fileSystem; status_t error = get_port_and_fs(&port, &fileSystem); if (error != B_OK) return error;