RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 09:57:35 +00:00
Code Issues Activity Actions

Kernel: Use u64 instead of size_t for File::can_write offset

Browse source 
This ensures offsets will not be truncated on large files on i686.
This commit is contained in:
Idan Horowitz 2022-01-25 20:19:35 +02:00
parent 9ce537d703
commit 664ca58746
40 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Storage/Partition/DiskPartition.cpp
View file

@ -68,7 +68,7 @@ ErrorOr<size_t> DiskPartition::write(OpenFileDescription& fd, u64 offset, const
return m_device.strong_ref()->write(fd, offset + adjust, inbuf, len);
}
bool DiskPartition::can_write(const OpenFileDescription& fd, size_t offset) const
bool DiskPartition::can_write(const OpenFileDescription& fd, u64 offset) const
{
unsigned adjust = m_metadata.start_block() * block_size();
dbgln_if(OFFD_DEBUG, "DiskPartition::can_write offset={}, adjust={}", offset, adjust);

2
Kernel/Storage/Partition/DiskPartition.h
View file

@ -26,7 +26,7 @@ public:
virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
virtual bool can_read(const OpenFileDescription&, u64) const override;
virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override;
virtual bool can_write(const OpenFileDescription&, size_t) const override;
virtual bool can_write(const OpenFileDescription&, u64) const override;
const DiskPartitionMetadata& metadata() const;

2
Kernel/Storage/StorageDevice.cpp
View file

@ -180,7 +180,7 @@ StringView StorageDevice::early_storage_name() const
return m_early_storage_device_name->view();
}
bool StorageDevice::can_write(const OpenFileDescription&, size_t offset) const
bool StorageDevice::can_write(const OpenFileDescription&, u64 offset) const
{
return offset < (max_addressable_block() * block_size());
}

2
Kernel/Storage/StorageDevice.h
View file

@ -40,7 +40,7 @@ public:
virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
virtual bool can_read(const OpenFileDescription&, u64) const override;
virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override;
virtual bool can_write(const OpenFileDescription&, size_t) const override;
virtual bool can_write(const OpenFileDescription&, u64) const override;
virtual void prepare_for_unplug() { m_partitions.clear(); }
// FIXME: Remove this method after figuring out another scheme for naming.