diff options
| author | Andreas Kling <kling@serenityos.org> | 2021-03-04 10:58:40 +0100 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-03-04 11:25:45 +0100 |
| commit | a1d1a3b50b3c00effa8ea44dd7c1c080eed8c34b (patch) | |
| tree | 0a0755c88cc65d517887a7603a617fb7689c1700 | |
| parent | 40552bb5fba41070adb8924fcfdbc18b13a117a0 (diff) | |
| download | serenity-a1d1a3b50b3c00effa8ea44dd7c1c080eed8c34b.zip | |
Kernel: Use BitmapView instead of Bitmap::wrap()
| -rw-r--r-- | Kernel/FileSystem/Ext2FileSystem.cpp | 3 | ||||
| -rw-r--r-- | Kernel/FileSystem/Ext2FileSystem.h | 4 | ||||
| -rw-r--r-- | Kernel/Heap/Heap.h | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/Kernel/FileSystem/Ext2FileSystem.cpp b/Kernel/FileSystem/Ext2FileSystem.cpp index d6befa6882..4235078576 100644 --- a/Kernel/FileSystem/Ext2FileSystem.cpp +++ b/Kernel/FileSystem/Ext2FileSystem.cpp @@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <AK/Bitmap.h> #include <AK/HashMap.h> #include <AK/MemoryStream.h> #include <AK/StdLibExtras.h> @@ -1196,7 +1195,7 @@ auto Ext2FS::allocate_blocks(GroupIndex preferred_group_index, size_t count) -> auto& cached_bitmap = *cached_bitmap_or_error.value(); int blocks_in_group = min(blocks_per_group(), super_block().s_blocks_count); - auto block_bitmap = Bitmap::wrap(cached_bitmap.buffer.data(), blocks_in_group); + auto block_bitmap = cached_bitmap.bitmap(blocks_in_group); BlockIndex first_block_in_group = (group_index.value() - 1) * blocks_per_group() + first_block_index().value(); size_t free_region_size = 0; diff --git a/Kernel/FileSystem/Ext2FileSystem.h b/Kernel/FileSystem/Ext2FileSystem.h index 71e6a31273..f1bf4fb106 100644 --- a/Kernel/FileSystem/Ext2FileSystem.h +++ b/Kernel/FileSystem/Ext2FileSystem.h @@ -26,7 +26,7 @@ #pragma once -#include <AK/Bitmap.h> +#include <AK/BitmapView.h> #include <AK/HashMap.h> #include <Kernel/FileSystem/BlockBasedFileSystem.h> #include <Kernel/FileSystem/Inode.h> @@ -185,7 +185,7 @@ private: BlockIndex bitmap_block_index { 0 }; bool dirty { false }; KBuffer buffer; - Bitmap bitmap(u32 blocks_per_group) { return Bitmap::wrap(buffer.data(), blocks_per_group); } + BitmapView bitmap(u32 blocks_per_group) { return BitmapView { buffer.data(), blocks_per_group }; } }; KResultOr<CachedBitmap*> get_bitmap_block(BlockIndex); diff --git a/Kernel/Heap/Heap.h b/Kernel/Heap/Heap.h index 2bf8bf9980..f5c82f402c 100644 --- a/Kernel/Heap/Heap.h +++ b/Kernel/Heap/Heap.h @@ -26,7 +26,7 @@ #pragma once -#include <AK/Bitmap.h> +#include <AK/BitmapView.h> #include <AK/ScopeGuard.h> #include <AK/TemporaryChange.h> #include <AK/Vector.h> @@ -52,7 +52,7 @@ public: Heap(u8* memory, size_t memory_size) : m_total_chunks(calculate_chunks(memory_size)) , m_chunks(memory) - , m_bitmap(Bitmap::wrap(memory + m_total_chunks * CHUNK_SIZE, m_total_chunks)) + , m_bitmap(memory + m_total_chunks * CHUNK_SIZE, m_total_chunks) { // To keep the alignment of the memory passed in, place the bitmap // at the end of the memory block. @@ -170,7 +170,7 @@ private: size_t m_total_chunks { 0 }; size_t m_allocated_chunks { 0 }; u8* m_chunks { nullptr }; - Bitmap m_bitmap; + BitmapView m_bitmap; }; template<typename ExpandHeap> |