diff --git a/kernel/include/kernel/FS/Ext2/FileSystem.h b/kernel/include/kernel/FS/Ext2/FileSystem.h index 144a9be5..bb2244a2 100644 --- a/kernel/include/kernel/FS/Ext2/FileSystem.h +++ b/kernel/include/kernel/FS/Ext2/FileSystem.h @@ -62,8 +62,6 @@ namespace Kernel virtual BAN::RefPtr root_inode() override { return m_root_inode; } - virtual dev_t dev() const override { return m_block_device->rdev(); }; - private: Ext2FS(BAN::RefPtr block_device) : m_block_device(block_device) diff --git a/kernel/include/kernel/FS/FAT/FileSystem.h b/kernel/include/kernel/FS/FAT/FileSystem.h index 3ff6d155..740def36 100644 --- a/kernel/include/kernel/FS/FAT/FileSystem.h +++ b/kernel/include/kernel/FS/FAT/FileSystem.h @@ -37,8 +37,6 @@ namespace Kernel virtual BAN::RefPtr root_inode() override { return m_root_inode; } - virtual dev_t dev() const override { return m_block_device->rdev(); }; - BAN::ErrorOr> open_inode(BAN::RefPtr parent, const FAT::DirectoryEntry& entry, uint32_t cluster_index, uint32_t entry_index); BAN::ErrorOr inode_read_cluster(BAN::RefPtr, size_t index, BAN::ByteSpan buffer); blksize_t inode_block_size(BAN::RefPtr) const; diff --git a/kernel/include/kernel/FS/FileSystem.h b/kernel/include/kernel/FS/FileSystem.h index b785d725..58d8f422 100644 --- a/kernel/include/kernel/FS/FileSystem.h +++ b/kernel/include/kernel/FS/FileSystem.h @@ -26,8 +26,6 @@ namespace Kernel static BAN::ErrorOr> from_block_device(BAN::RefPtr); virtual BAN::RefPtr root_inode() = 0; - - virtual dev_t dev() const = 0; }; } diff --git a/kernel/include/kernel/FS/TmpFS/FileSystem.h b/kernel/include/kernel/FS/TmpFS/FileSystem.h index 0898c839..c8c2b64c 100644 --- a/kernel/include/kernel/FS/TmpFS/FileSystem.h +++ b/kernel/include/kernel/FS/TmpFS/FileSystem.h @@ -58,7 +58,7 @@ namespace Kernel virtual BAN::RefPtr root_inode() override { return m_root_inode; } - virtual dev_t dev() const override { return m_rdev; } + dev_t rdev() const { return m_rdev; } BAN::ErrorOr> open_inode(ino_t ino); diff --git a/kernel/include/kernel/FS/VirtualFileSystem.h b/kernel/include/kernel/FS/VirtualFileSystem.h index d023d8ac..c16b8577 100644 --- a/kernel/include/kernel/FS/VirtualFileSystem.h +++ b/kernel/include/kernel/FS/VirtualFileSystem.h @@ -29,9 +29,6 @@ namespace Kernel virtual BAN::RefPtr root_inode() override { return m_root_fs->root_inode(); } - // FIXME: - virtual dev_t dev() const override { return 0; } - BAN::ErrorOr mount(const Credentials&, BAN::StringView, BAN::StringView); BAN::ErrorOr mount(const Credentials&, BAN::RefPtr, BAN::StringView); diff --git a/kernel/kernel/FS/TmpFS/Inode.cpp b/kernel/kernel/FS/TmpFS/Inode.cpp index c28ba0e1..c26abefe 100644 --- a/kernel/kernel/FS/TmpFS/Inode.cpp +++ b/kernel/kernel/FS/TmpFS/Inode.cpp @@ -50,7 +50,7 @@ namespace Kernel dev_t TmpInode::dev() const { - return m_fs.dev(); + return m_fs.rdev(); } BAN::ErrorOr> TmpInode::create_from_existing(TmpFileSystem& fs, ino_t ino, const TmpInodeInfo& info)