RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 14:27:35 +00:00
Code Issues Activity Actions

Rename CoreInode to Inode.

Browse source 
I don't know what I was thinking here. Clearly Inode is the right name.
This commit is contained in:
Andreas Kling 2018-12-19 21:18:28 +01:00
parent 038d8641f9
commit d506c857ab
9 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/Process.h
View file

@ -209,8 +209,8 @@ public:
template<typename T> bool validate_read_typed(T* value, size_t count = 1) { return validate_read(value, sizeof(T) * count); } template<typename T> bool validate_read_typed(T* value, size_t count = 1) { return validate_read(value, sizeof(T) * count); }
template<typename T> bool validate_write_typed(T* value, size_t count = 1) { return validate_write(value, sizeof(T) * count); } template<typename T> bool validate_write_typed(T* value, size_t count = 1) { return validate_write(value, sizeof(T) * count); }
CoreInode* cwd_inode() { return m_cwd ? m_cwd->core_inode() : nullptr; } Inode* cwd_inode() { return m_cwd ? m_cwd->core_inode() : nullptr; }
CoreInode* executable_inode() { return m_executable ? m_executable->core_inode() : nullptr; } Inode* executable_inode() { return m_executable ? m_executable->core_inode() : nullptr; }
size_t number_of_open_file_descriptors() const; size_t number_of_open_file_descriptors() const;
size_t max_open_file_descriptors() const { return m_max_open_file_descriptors; } size_t max_open_file_descriptors() const { return m_max_open_file_descriptors; }

4
VirtualFileSystem/Ext2FileSystem.cpp
View file

@ -273,7 +273,7 @@ Vector<unsigned> Ext2FS::block_list_for_inode(const ext2_inode& e2inode) const
} }
Ext2FSInode::Ext2FSInode(Ext2FS& fs, unsigned index, const ext2_inode& raw_inode) Ext2FSInode::Ext2FSInode(Ext2FS& fs, unsigned index, const ext2_inode& raw_inode)
: CoreInode(fs, index) : Inode(fs, index)
, m_raw_inode(raw_inode) , m_raw_inode(raw_inode)
{ {
} }
@ -304,7 +304,7 @@ void Ext2FSInode::populate_metadata() const
} }
} }
RetainPtr<CoreInode> Ext2FS::get_inode(InodeIdentifier inode) const RetainPtr<Inode> Ext2FS::get_inode(InodeIdentifier inode) const
{ {
ASSERT(inode.fsid() == id()); ASSERT(inode.fsid() == id());
{ {

8
VirtualFileSystem/Ext2FileSystem.h
View file

@ -12,7 +12,7 @@ struct ext2_super_block;
class Ext2FS; class Ext2FS;
class Ext2FSInode final : public CoreInode { class Ext2FSInode final : public Inode {
friend class Ext2FS; friend class Ext2FS;
public: public:
virtual ~Ext2FSInode() override; virtual ~Ext2FSInode() override;
@ -77,7 +77,7 @@ private:
virtual ssize_t read_inode_bytes(InodeIdentifier, Unix::off_t offset, size_t count, byte* buffer, FileDescriptor*) const override; virtual ssize_t read_inode_bytes(InodeIdentifier, Unix::off_t offset, size_t count, byte* buffer, FileDescriptor*) const override;
virtual InodeIdentifier create_directory(InodeIdentifier parentInode, const String& name, Unix::mode_t, int& error) override; virtual InodeIdentifier create_directory(InodeIdentifier parentInode, const String& name, Unix::mode_t, int& error) override;
virtual InodeIdentifier find_parent_of_inode(InodeIdentifier) const override; virtual InodeIdentifier find_parent_of_inode(InodeIdentifier) const override;
virtual RetainPtr<CoreInode> get_inode(InodeIdentifier) const override; virtual RetainPtr<Inode> get_inode(InodeIdentifier) const override;
bool is_directory_inode(unsigned) const; bool is_directory_inode(unsigned) const;
unsigned allocate_inode(unsigned preferredGroup, unsigned expectedSize); unsigned allocate_inode(unsigned preferredGroup, unsigned expectedSize);
@ -110,10 +110,10 @@ private:
inline Ext2FS& Ext2FSInode::fs() inline Ext2FS& Ext2FSInode::fs()
{ {
return static_cast<Ext2FS&>(CoreInode::fs()); return static_cast<Ext2FS&>(Inode::fs());
} }
inline const Ext2FS& Ext2FSInode::fs() const inline const Ext2FS& Ext2FSInode::fs() const
{ {
return static_cast<const Ext2FS&>(CoreInode::fs()); return static_cast<const Ext2FS&>(Inode::fs());
} }

6
VirtualFileSystem/FileSystem.cpp
View file

@ -37,7 +37,7 @@ FS* FS::from_fsid(dword id)
return nullptr; return nullptr;
} }
ByteBuffer CoreInode::read_entire(FileDescriptor* descriptor) ByteBuffer Inode::read_entire(FileDescriptor* descriptor)
{ {
return fs().read_entire_inode(identifier(), descriptor); return fs().read_entire_inode(identifier(), descriptor);
/* /*
@ -124,11 +124,11 @@ FS::DirectoryEntry::DirectoryEntry(const char* n, size_t nl, InodeIdentifier i,
name[nl] = '\0'; name[nl] = '\0';
} }
CoreInode::~CoreInode() Inode::~Inode()
{ {
} }
int CoreInode::set_atime_and_mtime(Unix::time_t atime, Unix::time_t mtime) int Inode::set_atime_and_mtime(Unix::time_t atime, Unix::time_t mtime)
{ {
return fs().set_atime_and_mtime(identifier(), atime, mtime); return fs().set_atime_and_mtime(identifier(), atime, mtime);
} }

12
VirtualFileSystem/FileSystem.h
View file

@ -16,7 +16,7 @@
static const dword mepoch = 476763780; static const dword mepoch = 476763780;
class CoreInode; class Inode;
class FileDescriptor; class FileDescriptor;
class FS : public Retainable<FS> { class FS : public Retainable<FS> {
@ -50,7 +50,7 @@ public:
virtual InodeIdentifier find_parent_of_inode(InodeIdentifier) const = 0; virtual InodeIdentifier find_parent_of_inode(InodeIdentifier) const = 0;
virtual RetainPtr<CoreInode> get_inode(InodeIdentifier) const = 0; virtual RetainPtr<Inode> get_inode(InodeIdentifier) const = 0;
ByteBuffer read_entire_inode(InodeIdentifier, FileDescriptor* = nullptr) const; ByteBuffer read_entire_inode(InodeIdentifier, FileDescriptor* = nullptr) const;
@ -61,10 +61,10 @@ private:
dword m_fsid { 0 }; dword m_fsid { 0 };
}; };
class CoreInode : public Retainable<CoreInode> { class Inode : public Retainable<Inode> {
friend class VFS; friend class VFS;
public: public:
virtual ~CoreInode(); virtual ~Inode();
FS& fs() { return m_fs; } FS& fs() { return m_fs; }
const FS& fs() const { return m_fs; } const FS& fs() const { return m_fs; }
@ -88,7 +88,7 @@ public:
int set_atime_and_mtime(Unix::time_t atime, Unix::time_t mtime); int set_atime_and_mtime(Unix::time_t atime, Unix::time_t mtime);
protected: protected:
CoreInode(FS& fs, unsigned index) Inode(FS& fs, unsigned index)
: m_fs(fs) : m_fs(fs)
, m_index(index) , m_index(index)
{ {
@ -124,7 +124,7 @@ inline bool InodeIdentifier::is_root_inode() const
return (*this) == fs()->root_inode(); return (*this) == fs()->root_inode();
} }
inline unsigned CoreInode::fsid() const inline unsigned Inode::fsid() const
{ {
return m_fs.id(); return m_fs.id();
} }

4
VirtualFileSystem/SyntheticFileSystem.cpp
View file

@ -227,7 +227,7 @@ InodeIdentifier SynthFS::find_parent_of_inode(InodeIdentifier inode) const
return (*it).value->m_parent; return (*it).value->m_parent;
} }
RetainPtr<CoreInode> SynthFS::get_inode(InodeIdentifier inode) const RetainPtr<Inode> SynthFS::get_inode(InodeIdentifier inode) const
{ {
auto it = m_inodes.find(inode.index()); auto it = m_inodes.find(inode.index());
if (it == m_inodes.end()) if (it == m_inodes.end())
@ -236,7 +236,7 @@ RetainPtr<CoreInode> SynthFS::get_inode(InodeIdentifier inode) const
} }
SynthFSInode::SynthFSInode(SynthFS& fs, unsigned index) SynthFSInode::SynthFSInode(SynthFS& fs, unsigned index)
: CoreInode(fs, index) : Inode(fs, index)
{ {
m_metadata.inode = { fs.id(), index }; m_metadata.inode = { fs.id(), index };
} }

4
VirtualFileSystem/SyntheticFileSystem.h
View file

@ -21,7 +21,7 @@ public:
virtual ssize_t read_inode_bytes(InodeIdentifier, Unix::off_t offset, size_t count, byte* buffer, FileDescriptor*) const override; virtual ssize_t read_inode_bytes(InodeIdentifier, Unix::off_t offset, size_t count, byte* buffer, FileDescriptor*) const override;
virtual InodeIdentifier create_directory(InodeIdentifier parentInode, const String& name, Unix::mode_t, int& error) override; virtual InodeIdentifier create_directory(InodeIdentifier parentInode, const String& name, Unix::mode_t, int& error) override;
virtual InodeIdentifier find_parent_of_inode(InodeIdentifier) const override; virtual InodeIdentifier find_parent_of_inode(InodeIdentifier) const override;
virtual RetainPtr<CoreInode> get_inode(InodeIdentifier) const override; virtual RetainPtr<Inode> get_inode(InodeIdentifier) const override;
protected: protected:
typedef unsigned InodeIndex; typedef unsigned InodeIndex;
@ -43,7 +43,7 @@ private:
HashMap<InodeIndex, RetainPtr<SynthFSInode>> m_inodes; HashMap<InodeIndex, RetainPtr<SynthFSInode>> m_inodes;
}; };
class SynthFSInode final : public CoreInode { class SynthFSInode final : public Inode {
friend class SynthFS; friend class SynthFS;
public: public:
virtual ~SynthFSInode() override; virtual ~SynthFSInode() override;

8
VirtualFileSystem/VirtualFileSystem.cpp
View file

@ -233,7 +233,7 @@ bool VFS::is_vfs_root(InodeIdentifier inode) const
return inode == m_root_vnode->inode; return inode == m_root_vnode->inode;
} }
void VFS::traverse_directory_inode(CoreInode& dir_inode, Function<bool(const FS::DirectoryEntry&)> callback) void VFS::traverse_directory_inode(Inode& dir_inode, Function<bool(const FS::DirectoryEntry&)> callback)
{ {
dir_inode.traverse_as_directory([&] (const FS::DirectoryEntry& entry) { dir_inode.traverse_as_directory([&] (const FS::DirectoryEntry& entry) {
InodeIdentifier resolvedInode; InodeIdentifier resolvedInode;
@ -326,18 +326,18 @@ InodeIdentifier VFS::resolveSymbolicLink(InodeIdentifier base, InodeIdentifier s
return resolve_path(linkee, base, error); return resolve_path(linkee, base, error);
} }
RetainPtr<CoreInode> VFS::get_inode(InodeIdentifier inode_id) RetainPtr<Inode> VFS::get_inode(InodeIdentifier inode_id)
{ {
if (!inode_id.is_valid()) if (!inode_id.is_valid())
return nullptr; return nullptr;
return inode_id.fs()->get_inode(inode_id); return inode_id.fs()->get_inode(inode_id);
} }
String VFS::absolute_path(CoreInode& core_inode) String VFS::absolute_path(Inode& core_inode)
{ {
int error; int error;
Vector<InodeIdentifier> lineage; Vector<InodeIdentifier> lineage;
RetainPtr<CoreInode> inode = &core_inode; RetainPtr<Inode> inode = &core_inode;
while (inode->identifier() != m_root_vnode->inode) { while (inode->identifier() != m_root_vnode->inode) {
if (auto* mount = find_mount_for_guest(inode->identifier())) if (auto* mount = find_mount_for_guest(inode->identifier()))
lineage.append(mount->host()); lineage.append(mount->host());

10
VirtualFileSystem/VirtualFileSystem.h
View file

@ -60,7 +60,7 @@ public:
unsigned retain_count() const { return retainCount; } unsigned retain_count() const { return retainCount; }
CoreInode* core_inode() { return m_core_inode.ptr(); } Inode* core_inode() { return m_core_inode.ptr(); }
private: private:
friend class VFS; friend class VFS;
@ -69,7 +69,7 @@ private:
CharacterDevice* m_characterDevice { nullptr }; CharacterDevice* m_characterDevice { nullptr };
mutable InodeMetadata m_cachedMetadata; mutable InodeMetadata m_cachedMetadata;
void* m_vmo { nullptr }; void* m_vmo { nullptr };
RetainPtr<CoreInode> m_core_inode; RetainPtr<Inode> m_core_inode;
}; };
class VFS { class VFS {
@ -119,7 +119,7 @@ public:
size_t mount_count() const { return m_mounts.size(); } size_t mount_count() const { return m_mounts.size(); }
void for_each_mount(Function<void(const Mount&)>) const; void for_each_mount(Function<void(const Mount&)>) const;
String absolute_path(CoreInode&); String absolute_path(Inode&);
InodeIdentifier root_inode_id() const; InodeIdentifier root_inode_id() const;
@ -127,11 +127,11 @@ private:
friend class FileDescriptor; friend class FileDescriptor;
friend class Vnode; friend class Vnode;
RetainPtr<CoreInode> get_inode(InodeIdentifier); RetainPtr<Inode> get_inode(InodeIdentifier);
bool is_vfs_root(InodeIdentifier) const; bool is_vfs_root(InodeIdentifier) const;
void traverse_directory_inode(CoreInode&, Function<bool(const FS::DirectoryEntry&)>); void traverse_directory_inode(Inode&, Function<bool(const FS::DirectoryEntry&)>);
InodeIdentifier resolve_path(const String& path, InodeIdentifier base, int& error, int options = 0, InodeIdentifier* deepest_dir = nullptr); InodeIdentifier resolve_path(const String& path, InodeIdentifier base, int& error, int options = 0, InodeIdentifier* deepest_dir = nullptr);
InodeIdentifier resolveSymbolicLink(InodeIdentifier base, InodeIdentifier symlinkInode, int& error); InodeIdentifier resolveSymbolicLink(InodeIdentifier base, InodeIdentifier symlinkInode, int& error);