From f85b94e6d4e7becf802e9f39461c85f0d6753b13 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 20 Jul 2021 15:16:25 +0200 Subject: [PATCH] Kernel: Remove KBufferBuilder's can_expand restriction KBufferBuilder is always allowed to expand if it wants to. This restriction was added a long time ago when it was unsafe to allocate VM while generating ProcFS contents. --- Kernel/KBufferBuilder.cpp | 5 +---- Kernel/KBufferBuilder.h | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Kernel/KBufferBuilder.cpp b/Kernel/KBufferBuilder.cpp index 592a86c117..2c514b01fe 100644 --- a/Kernel/KBufferBuilder.cpp +++ b/Kernel/KBufferBuilder.cpp @@ -15,8 +15,6 @@ inline bool KBufferBuilder::check_expand(size_t size) return false; if ((m_size + size) < m_buffer->capacity()) return true; - if (!m_can_expand) - return false; if (Checked::addition_would_overflow(m_size, size)) return false; size_t new_buffer_size = m_size + size; @@ -42,9 +40,8 @@ OwnPtr KBufferBuilder::build() return try_make(move(m_buffer)); } -KBufferBuilder::KBufferBuilder(bool can_expand) +KBufferBuilder::KBufferBuilder() : m_buffer(KBufferImpl::try_create_with_size(4 * MiB, Region::Access::Read | Region::Access::Write)) - , m_can_expand(can_expand) { } diff --git a/Kernel/KBufferBuilder.h b/Kernel/KBufferBuilder.h index 8e470547f2..8cdd147647 100644 --- a/Kernel/KBufferBuilder.h +++ b/Kernel/KBufferBuilder.h @@ -16,7 +16,7 @@ class KBufferBuilder { public: using OutputType = KBuffer; - explicit KBufferBuilder(bool can_expand = false); + KBufferBuilder(); KBufferBuilder(KBufferBuilder&&) = default; ~KBufferBuilder() = default; @@ -50,7 +50,6 @@ private: RefPtr m_buffer; size_t m_size { 0 }; - bool m_can_expand { false }; }; }