From 04ee69392548ec736d6149e5edeb535004fad275 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Fri, 21 Dec 2018 17:31:54 +0100
Subject: [PATCH] Get rid of FS::inode_metadata() since we use
 Inode::metadata() everywhere.

---
 VirtualFileSystem/Ext2FileSystem.cpp      | 31 -----------------------
 VirtualFileSystem/Ext2FileSystem.h        |  1 -
 VirtualFileSystem/FileSystem.h            |  1 -
 VirtualFileSystem/SyntheticFileSystem.cpp | 14 ----------
 VirtualFileSystem/SyntheticFileSystem.h   |  1 -
 5 files changed, 48 deletions(-)

diff --git a/VirtualFileSystem/Ext2FileSystem.cpp b/VirtualFileSystem/Ext2FileSystem.cpp
index 584694e814..9031e6c8e8 100644
--- a/VirtualFileSystem/Ext2FileSystem.cpp
+++ b/VirtualFileSystem/Ext2FileSystem.cpp
@@ -180,37 +180,6 @@ OwnPtr<ext2_inode> Ext2FS::lookup_ext2_inode(unsigned inode) const
     return OwnPtr<ext2_inode>(e2inode);
 }
 
-InodeMetadata Ext2FS::inode_metadata(InodeIdentifier inode) const
-{
-    ASSERT(inode.fsid() == id());
-
-    auto e2inode = lookup_ext2_inode(inode.index());
-    if (!e2inode)
-        return InodeMetadata();
-
-    InodeMetadata metadata;
-    metadata.inode = inode;
-    metadata.size = e2inode->i_size;
-    metadata.mode = e2inode->i_mode;
-    metadata.uid = e2inode->i_uid;
-    metadata.gid = e2inode->i_gid;
-    metadata.linkCount = e2inode->i_links_count;
-    metadata.atime = e2inode->i_atime;
-    metadata.ctime = e2inode->i_ctime;
-    metadata.mtime = e2inode->i_mtime;
-    metadata.dtime = e2inode->i_dtime;
-    metadata.blockSize = blockSize();
-    metadata.blockCount = e2inode->i_blocks;
-
-    if (isBlockDevice(e2inode->i_mode) || isCharacterDevice(e2inode->i_mode)) {
-        unsigned dev = e2inode->i_block[0];
-        metadata.majorDevice = (dev & 0xfff00) >> 8;
-        metadata.minorDevice= (dev & 0xff) | ((dev >> 12) & 0xfff00);
-    }
-
-    return metadata;
-}
-
 Vector<unsigned> Ext2FS::block_list_for_inode(const ext2_inode& e2inode) const
 {
     unsigned entriesPerBlock = EXT2_ADDR_PER_BLOCK(&super_block());
diff --git a/VirtualFileSystem/Ext2FileSystem.h b/VirtualFileSystem/Ext2FileSystem.h
index 6499ec5088..5469c513b3 100644
--- a/VirtualFileSystem/Ext2FileSystem.h
+++ b/VirtualFileSystem/Ext2FileSystem.h
@@ -72,7 +72,6 @@ private:
     virtual const char* class_name() const override;
     virtual InodeIdentifier root_inode() const override;
     virtual bool write_inode(InodeIdentifier, const ByteBuffer&) override;
-    virtual InodeMetadata inode_metadata(InodeIdentifier) const override;
     virtual InodeIdentifier create_inode(InodeIdentifier parentInode, const String& name, Unix::mode_t, unsigned size, 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;
diff --git a/VirtualFileSystem/FileSystem.h b/VirtualFileSystem/FileSystem.h
index a6b86d8a9f..8448be8806 100644
--- a/VirtualFileSystem/FileSystem.h
+++ b/VirtualFileSystem/FileSystem.h
@@ -32,7 +32,6 @@ public:
     virtual const char* class_name() const = 0;
     virtual InodeIdentifier root_inode() const = 0;
     virtual bool write_inode(InodeIdentifier, const ByteBuffer&) = 0;
-    virtual InodeMetadata inode_metadata(InodeIdentifier) const = 0;
 
     bool is_readonly() const { return m_readonly; }
 
diff --git a/VirtualFileSystem/SyntheticFileSystem.cpp b/VirtualFileSystem/SyntheticFileSystem.cpp
index bc427d9926..10854a3e29 100644
--- a/VirtualFileSystem/SyntheticFileSystem.cpp
+++ b/VirtualFileSystem/SyntheticFileSystem.cpp
@@ -132,20 +132,6 @@ InodeIdentifier SynthFS::root_inode() const
     return { id(), 1 };
 }
 
-InodeMetadata SynthFS::inode_metadata(InodeIdentifier inode) const
-{
-    InterruptDisabler disabler;
-    ASSERT(inode.fsid() == id());
-#ifdef SYNTHFS_DEBUG
-    kprintf("SynthFS: inodeMetadata(%u)\n", inode.index());
-#endif
-
-    auto it = m_inodes.find(inode.index());
-    if (it == m_inodes.end())
-        return { };
-    return (*it).value->m_metadata;
-}
-
 InodeIdentifier SynthFS::create_inode(InodeIdentifier parentInode, const String& name, Unix::mode_t mode, unsigned size, int& error)
 {
     (void) parentInode;
diff --git a/VirtualFileSystem/SyntheticFileSystem.h b/VirtualFileSystem/SyntheticFileSystem.h
index 195a142af5..50cda6babc 100644
--- a/VirtualFileSystem/SyntheticFileSystem.h
+++ b/VirtualFileSystem/SyntheticFileSystem.h
@@ -15,7 +15,6 @@ public:
     virtual const char* class_name() const override;
     virtual InodeIdentifier root_inode() const override;
     virtual bool write_inode(InodeIdentifier, const ByteBuffer&) override;
-    virtual InodeMetadata inode_metadata(InodeIdentifier) const override;
     virtual InodeIdentifier create_inode(InodeIdentifier parentInode, const String& name, Unix::mode_t, unsigned size, 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;