diff --git a/Kernel/FileSystem/SyntheticFileSystem.cpp b/Kernel/FileSystem/SyntheticFileSystem.cpp index a70440ce8d..49c61f9e30 100644 --- a/Kernel/FileSystem/SyntheticFileSystem.cpp +++ b/Kernel/FileSystem/SyntheticFileSystem.cpp @@ -45,19 +45,6 @@ NonnullRefPtr SynthFS::create_directory(String&& name) return file; } -NonnullRefPtr SynthFS::create_text_file(String&& name, ByteBuffer&& contents, mode_t mode) -{ - auto file = adopt(*new SynthFSInode(*this, generate_inode_index())); - file->m_data = contents; - file->m_name = move(name); - file->m_metadata.size = file->m_data.value().size(); - file->m_metadata.uid = 100; - file->m_metadata.gid = 200; - file->m_metadata.mode = mode; - file->m_metadata.mtime = mepoch; - return file; -} - NonnullRefPtr SynthFS::create_generated_file(String&& name, Function&& generator, mode_t mode) { auto file = adopt(*new SynthFSInode(*this, generate_inode_index())); @@ -205,15 +192,9 @@ ssize_t SynthFSInode::read_bytes(off_t offset, ssize_t count, u8* buffer, FileDe } } - const KBuffer* data_to_use = nullptr; - if (generated_data.has_value()) - data_to_use = &generated_data.value(); - else if (m_data.has_value()) - data_to_use = &m_data.value(); - else - ASSERT_NOT_REACHED(); - ssize_t nread = min(static_cast(data_to_use->size() - offset), static_cast(count)); - memcpy(buffer, data_to_use->data() + offset, nread); + ASSERT(generated_data.has_value()); + ssize_t nread = min(static_cast(generated_data.value().size() - offset), static_cast(count)); + memcpy(buffer, generated_data.value().data() + offset, nread); if (nread == 0 && description && description->generator_cache()) description->generator_cache().clear(); return nread; diff --git a/Kernel/FileSystem/SyntheticFileSystem.h b/Kernel/FileSystem/SyntheticFileSystem.h index 92d8e64115..df7cdccd16 100644 --- a/Kernel/FileSystem/SyntheticFileSystem.h +++ b/Kernel/FileSystem/SyntheticFileSystem.h @@ -29,7 +29,6 @@ protected: SynthFS(); NonnullRefPtr create_directory(String&& name); - NonnullRefPtr create_text_file(String&& name, ByteBuffer&&, mode_t = 0010644); NonnullRefPtr create_generated_file(String&& name, Function&&, mode_t = 0100644); NonnullRefPtr create_generated_file(String&& name, Function&&, Function&&, mode_t = 0100644); @@ -76,7 +75,6 @@ private: String m_name; InodeIdentifier m_parent; - Optional m_data; Function m_generator; Function m_write_callback; Vector m_children;