summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Kernel/FileSystem/Ext2FileSystem.cpp5
-rw-r--r--Kernel/FileSystem/Inode.cpp14
-rw-r--r--Kernel/FileSystem/Inode.h2
-rw-r--r--Kernel/FileSystem/TmpFS.cpp13
-rw-r--r--Kernel/VM/InodeVMObject.cpp32
-rw-r--r--Kernel/VM/InodeVMObject.h3
6 files changed, 0 insertions, 69 deletions
diff --git a/Kernel/FileSystem/Ext2FileSystem.cpp b/Kernel/FileSystem/Ext2FileSystem.cpp
index 4235078576..75b58a10ca 100644
--- a/Kernel/FileSystem/Ext2FileSystem.cpp
+++ b/Kernel/FileSystem/Ext2FileSystem.cpp
@@ -889,7 +889,6 @@ ssize_t Ext2FSInode::write_bytes(off_t offset, ssize_t count, const UserOrKernel
bool allow_cache = !description || !description->is_direct();
const size_t block_size = fs().block_size();
- u64 old_size = size();
u64 new_size = max(static_cast<u64>(offset) + count, (u64)size());
auto resize_result = resize(new_size);
@@ -930,10 +929,6 @@ ssize_t Ext2FSInode::write_bytes(off_t offset, ssize_t count, const UserOrKernel
}
dbgln_if(EXT2_VERY_DEBUG, "Ext2FS: After write, i_size={}, i_blocks={} ({} blocks in list)", m_raw_inode.i_size, m_raw_inode.i_blocks, m_block_list.size());
-
- if (old_size != new_size)
- inode_size_changed(old_size, new_size);
- inode_contents_changed(offset, count, data);
return nwritten;
}
diff --git a/Kernel/FileSystem/Inode.cpp b/Kernel/FileSystem/Inode.cpp
index 8858fd4a6d..d89e9411b6 100644
--- a/Kernel/FileSystem/Inode.cpp
+++ b/Kernel/FileSystem/Inode.cpp
@@ -137,20 +137,6 @@ void Inode::will_be_destroyed()
flush_metadata();
}
-void Inode::inode_contents_changed(off_t offset, ssize_t size, const UserOrKernelBuffer& data)
-{
- LOCKER(m_lock);
- if (auto shared_vmobject = this->shared_vmobject())
- shared_vmobject->inode_contents_changed({}, offset, size, data);
-}
-
-void Inode::inode_size_changed(size_t old_size, size_t new_size)
-{
- LOCKER(m_lock);
- if (auto shared_vmobject = this->shared_vmobject())
- shared_vmobject->inode_size_changed({}, old_size, new_size);
-}
-
int Inode::set_atime(time_t)
{
return -ENOTIMPL;
diff --git a/Kernel/FileSystem/Inode.h b/Kernel/FileSystem/Inode.h
index b87eb18f1c..d7906b9c09 100644
--- a/Kernel/FileSystem/Inode.h
+++ b/Kernel/FileSystem/Inode.h
@@ -129,8 +129,6 @@ public:
protected:
Inode(FS& fs, InodeIndex);
void set_metadata_dirty(bool);
- void inode_contents_changed(off_t, ssize_t, const UserOrKernelBuffer&);
- void inode_size_changed(size_t old_size, size_t new_size);
KResult prepare_to_write_data();
void did_add_child(const InodeIdentifier&);
diff --git a/Kernel/FileSystem/TmpFS.cpp b/Kernel/FileSystem/TmpFS.cpp
index 7fc7c4efbf..b2328cf5d5 100644
--- a/Kernel/FileSystem/TmpFS.cpp
+++ b/Kernel/FileSystem/TmpFS.cpp
@@ -204,13 +204,10 @@ ssize_t TmpFSInode::write_bytes(off_t offset, ssize_t size, const UserOrKernelBu
m_metadata.size = new_size;
set_metadata_dirty(true);
set_metadata_dirty(false);
- inode_size_changed(old_size, new_size);
}
if (!buffer.read(m_content->data() + offset, size)) // TODO: partial reads?
return -EFAULT;
- inode_contents_changed(offset, size, buffer);
-
return size;
}
@@ -353,18 +350,8 @@ KResult TmpFSInode::truncate(u64 size)
m_content = move(tmp);
}
- size_t old_size = m_metadata.size;
m_metadata.size = size;
notify_watchers();
-
- if (old_size != (size_t)size) {
- inode_size_changed(old_size, size);
- if (m_content) {
- auto buffer = UserOrKernelBuffer::for_kernel_buffer(m_content->data());
- inode_contents_changed(0, size, buffer);
- }
- }
-
return KSuccess;
}
diff --git a/Kernel/VM/InodeVMObject.cpp b/Kernel/VM/InodeVMObject.cpp
index 77f02d0af5..30bb0f629e 100644
--- a/Kernel/VM/InodeVMObject.cpp
+++ b/Kernel/VM/InodeVMObject.cpp
@@ -71,38 +71,6 @@ size_t InodeVMObject::amount_dirty() const
return count * PAGE_SIZE;
}
-void InodeVMObject::inode_size_changed(Badge<Inode>, size_t old_size, size_t new_size)
-{
- dbgln("VMObject::inode_size_changed: ({}:{}) {} -> {}", m_inode->fsid(), m_inode->index(), old_size, new_size);
-
- InterruptDisabler disabler;
-
- auto new_page_count = page_round_up(new_size) / PAGE_SIZE;
- m_physical_pages.resize(new_page_count);
-
- m_dirty_pages.grow(new_page_count, false);
-
- // FIXME: Consolidate with inode_contents_changed() so we only do a single walk.
- for_each_region([](auto& region) {
- region.remap();
- });
-}
-
-void InodeVMObject::inode_contents_changed(Badge<Inode>, off_t offset, [[maybe_unused]] ssize_t size, [[maybe_unused]] const UserOrKernelBuffer& data)
-{
- InterruptDisabler disabler;
- VERIFY(offset >= 0);
-
- // FIXME: Only invalidate the parts that actually changed.
- for (auto& physical_page : m_physical_pages)
- physical_page = nullptr;
-
- // FIXME: Consolidate with inode_size_changed() so we only do a single walk.
- for_each_region([](auto& region) {
- region.remap();
- });
-}
-
int InodeVMObject::release_all_clean_pages()
{
LOCKER(m_paging_lock);
diff --git a/Kernel/VM/InodeVMObject.h b/Kernel/VM/InodeVMObject.h
index 035663aa12..d00c8538b8 100644
--- a/Kernel/VM/InodeVMObject.h
+++ b/Kernel/VM/InodeVMObject.h
@@ -39,9 +39,6 @@ public:
Inode& inode() { return *m_inode; }
const Inode& inode() const { return *m_inode; }
- void inode_contents_changed(Badge<Inode>, off_t, ssize_t, const UserOrKernelBuffer&);
- void inode_size_changed(Badge<Inode>, size_t old_size, size_t new_size);
-
size_t amount_dirty() const;
size_t amount_clean() const;