RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 23:37:36 +00:00
Code Issues Activity Actions

Kernel: Refactor storage stack with u64 as block index

Browse source
This commit is contained in:
Jean-Baptiste Boric 2021-03-16 20:31:45 +01:00 • committed by Andreas Kling
parent 9a3aa7eb0b
commit 999c57ef2d
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kernel/Devices/BlockDevice.cpp
View file

@ -28,7 +28,7 @@
namespace Kernel {
AsyncBlockDeviceRequest::AsyncBlockDeviceRequest(Device& block_device, RequestType request_type, u32 block_index, u32 block_count, const UserOrKernelBuffer& buffer, size_t buffer_size)
AsyncBlockDeviceRequest::AsyncBlockDeviceRequest(Device& block_device, RequestType request_type, u64 block_index, u32 block_count, const UserOrKernelBuffer& buffer, size_t buffer_size)
: AsyncDeviceRequest(block_device)
, m_block_device(static_cast<BlockDevice&>(block_device))
, m_request_type(request_type)
@ -48,7 +48,7 @@ BlockDevice::~BlockDevice()
{
}
bool BlockDevice::read_block(unsigned index, UserOrKernelBuffer& buffer)
bool BlockDevice::read_block(u64 index, UserOrKernelBuffer& buffer)
{
auto read_request = make_request<AsyncBlockDeviceRequest>(AsyncBlockDeviceRequest::Read, index, 1, buffer, 512);
switch (read_request->wait().request_result()) {
@ -69,7 +69,7 @@ bool BlockDevice::read_block(unsigned index, UserOrKernelBuffer& buffer)
return false;
}
bool BlockDevice::write_block(unsigned index, const UserOrKernelBuffer& buffer)
bool BlockDevice::write_block(u64 index, const UserOrKernelBuffer& buffer)
{
auto write_request = make_request<AsyncBlockDeviceRequest>(AsyncBlockDeviceRequest::Write, index, 1, buffer, 512);
switch (write_request->wait().request_result()) {

10
Kernel/Devices/BlockDevice.h
View file

@ -39,10 +39,10 @@ public:
Write
};
AsyncBlockDeviceRequest(Device& block_device, RequestType request_type,
u32 block_index, u32 block_count, const UserOrKernelBuffer& buffer, size_t buffer_size);
u64 block_index, u32 block_count, const UserOrKernelBuffer& buffer, size_t buffer_size);
RequestType request_type() const { return m_request_type; }
u32 block_index() const { return m_block_index; }
u64 block_index() const { return m_block_index; }
u32 block_count() const { return m_block_count; }
UserOrKernelBuffer& buffer() { return m_buffer; }
const UserOrKernelBuffer& buffer() const { return m_buffer; }
@ -64,7 +64,7 @@ public:
private:
BlockDevice& m_block_device;
const RequestType m_request_type;
const u32 m_block_index;
const u64 m_block_index;
const u32 m_block_count;
UserOrKernelBuffer m_buffer;
const size_t m_buffer_size;
@ -77,8 +77,8 @@ public:
size_t block_size() const { return m_block_size; }
virtual bool is_seekable() const override { return true; }
bool read_block(unsigned index, UserOrKernelBuffer&);
bool write_block(unsigned index, const UserOrKernelBuffer&);
bool read_block(u64 index, UserOrKernelBuffer&);
bool write_block(u64 index, const UserOrKernelBuffer&);
virtual void start_request(AsyncBlockDeviceRequest&) = 0;