diff options
author | Idan Horowitz <idan.horowitz@gmail.com> | 2022-01-25 20:19:35 +0200 |
---|---|---|
committer | Idan Horowitz <idan.horowitz@gmail.com> | 2022-01-25 22:41:17 +0200 |
commit | 664ca58746041e412bb66fac5b638d8306c27262 (patch) | |
tree | d40c3de4fe622043f783960429a9c0eb43a2f969 | |
parent | 9ce537d7036bf4aff61d4ce10e7fe0b134c122b3 (diff) | |
download | serenity-664ca58746041e412bb66fac5b638d8306c27262.zip |
Kernel: Use u64 instead of size_t for File::can_write offset
This ensures offsets will not be truncated on large files on i686.
40 files changed, 40 insertions, 40 deletions
diff --git a/Kernel/Bus/VirtIO/ConsolePort.cpp b/Kernel/Bus/VirtIO/ConsolePort.cpp index e30b227cd4..c484879da9 100644 --- a/Kernel/Bus/VirtIO/ConsolePort.cpp +++ b/Kernel/Bus/VirtIO/ConsolePort.cpp @@ -115,7 +115,7 @@ ErrorOr<size_t> ConsolePort::read(OpenFileDescription& desc, u64, UserOrKernelBu return bytes_copied; } -bool ConsolePort::can_write(const OpenFileDescription&, size_t) const +bool ConsolePort::can_write(const OpenFileDescription&, u64) const { return m_console.get_queue(m_transmit_queue).has_free_slots() && m_transmit_buffer->has_space(); } diff --git a/Kernel/Bus/VirtIO/ConsolePort.h b/Kernel/Bus/VirtIO/ConsolePort.h index 44c50f09b9..40797ab397 100644 --- a/Kernel/Bus/VirtIO/ConsolePort.h +++ b/Kernel/Bus/VirtIO/ConsolePort.h @@ -39,7 +39,7 @@ private: virtual bool can_read(const OpenFileDescription&, u64) const override; virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override; - virtual bool can_write(const OpenFileDescription&, size_t) const override; + virtual bool can_write(const OpenFileDescription&, u64) const override; virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override; virtual ErrorOr<NonnullRefPtr<OpenFileDescription>> open(int options) override; diff --git a/Kernel/Devices/Audio/AC97.h b/Kernel/Devices/Audio/AC97.h index 36ed77190e..56c31acd9e 100644 --- a/Kernel/Devices/Audio/AC97.h +++ b/Kernel/Devices/Audio/AC97.h @@ -32,7 +32,7 @@ public: // ^CharacterDevice virtual bool can_read(const OpenFileDescription&, u64) const override { return false; } - virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; } + virtual bool can_write(const OpenFileDescription&, u64) const override { return true; } virtual ErrorOr<void> ioctl(OpenFileDescription&, unsigned, Userspace<void*>) override; virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override; virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override; diff --git a/Kernel/Devices/Audio/SB16.h b/Kernel/Devices/Audio/SB16.h index 5331b97847..a5b77dc76b 100644 --- a/Kernel/Devices/Audio/SB16.h +++ b/Kernel/Devices/Audio/SB16.h @@ -29,7 +29,7 @@ public: virtual bool can_read(const OpenFileDescription&, u64) const override; virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override; virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override; - virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; } + virtual bool can_write(const OpenFileDescription&, u64) const override { return true; } virtual StringView purpose() const override { return class_name(); } diff --git a/Kernel/Devices/ConsoleDevice.h b/Kernel/Devices/ConsoleDevice.h index 192d693f97..7af4d41bb8 100644 --- a/Kernel/Devices/ConsoleDevice.h +++ b/Kernel/Devices/ConsoleDevice.h @@ -22,7 +22,7 @@ public: // ^CharacterDevice virtual bool can_read(const Kernel::OpenFileDescription&, u64) const override; - virtual bool can_write(const Kernel::OpenFileDescription&, size_t) const override { return true; } + virtual bool can_write(const Kernel::OpenFileDescription&, u64) const override { return true; } virtual ErrorOr<size_t> read(OpenFileDescription&, u64, Kernel::UserOrKernelBuffer&, size_t) override; virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const Kernel::UserOrKernelBuffer&, size_t) override; virtual StringView class_name() const override { return "Console"sv; } diff --git a/Kernel/Devices/DeviceControlDevice.h b/Kernel/Devices/DeviceControlDevice.h index f192778cfb..8eeb0670f8 100644 --- a/Kernel/Devices/DeviceControlDevice.h +++ b/Kernel/Devices/DeviceControlDevice.h @@ -25,7 +25,7 @@ private: virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override; virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override { return Error::from_errno(ENOTSUP); } virtual bool can_read(const OpenFileDescription&, u64) const override; - virtual bool can_write(const OpenFileDescription&, size_t) const override { return false; } + virtual bool can_write(const OpenFileDescription&, u64) const override { return false; } virtual StringView class_name() const override { return "DeviceControlDevice"sv; } }; diff --git a/Kernel/Devices/FullDevice.h b/Kernel/Devices/FullDevice.h index 44bf07c75f..2206f789d2 100644 --- a/Kernel/Devices/FullDevice.h +++ b/Kernel/Devices/FullDevice.h @@ -24,7 +24,7 @@ private: virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override; virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override; virtual bool can_read(const OpenFileDescription&, u64) const override; - virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; } + virtual bool can_write(const OpenFileDescription&, u64) const override { return true; } virtual StringView class_name() const override { return "FullDevice"sv; } }; diff --git a/Kernel/Devices/HID/KeyboardDevice.h b/Kernel/Devices/HID/KeyboardDevice.h index 4b865ba09f..b96343535e 100644 --- a/Kernel/Devices/HID/KeyboardDevice.h +++ b/Kernel/Devices/HID/KeyboardDevice.h @@ -28,7 +28,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 { return EINVAL; } - virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; } + virtual bool can_write(const OpenFileDescription&, u64) const override { return true; } // ^HIDDevice virtual Type instrument_type() const override { return Type::Keyboard; } diff --git a/Kernel/Devices/HID/MouseDevice.h b/Kernel/Devices/HID/MouseDevice.h index a39f2cb014..d80d4fcce3 100644 --- a/Kernel/Devices/HID/MouseDevice.h +++ b/Kernel/Devices/HID/MouseDevice.h @@ -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 { return EINVAL; } - virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; } + virtual bool can_write(const OpenFileDescription&, u64) const override { return true; } // ^HIDDevice virtual Type instrument_type() const override { return Type::Mouse; } diff --git a/Kernel/Devices/KCOVDevice.h b/Kernel/Devices/KCOVDevice.h index c8eebf8c31..8d2af84c92 100644 --- a/Kernel/Devices/KCOVDevice.h +++ b/Kernel/Devices/KCOVDevice.h @@ -31,7 +31,7 @@ protected: virtual StringView class_name() const override { return "KCOVDevice"sv; } virtual bool can_read(const OpenFileDescription&, u64) const override final { return true; } - virtual bool can_write(const OpenFileDescription&, size_t) const override final { return true; } + virtual bool can_write(const OpenFileDescription&, u64) const override final { return true; } virtual void start_request(AsyncBlockDeviceRequest& request) override final { request.complete(AsyncDeviceRequest::Failure); } virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override { return EINVAL; } virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override { return EINVAL; } diff --git a/Kernel/Devices/MemoryDevice.h b/Kernel/Devices/MemoryDevice.h index a311d6561b..2efa9614a0 100644 --- a/Kernel/Devices/MemoryDevice.h +++ b/Kernel/Devices/MemoryDevice.h @@ -26,7 +26,7 @@ private: virtual StringView class_name() const override { return "MemoryDevice"sv; } virtual bool can_read(const OpenFileDescription&, u64) const override { return true; } - virtual bool can_write(const OpenFileDescription&, size_t) const override { return false; } + virtual bool can_write(const OpenFileDescription&, u64) const override { return false; } virtual bool is_seekable() const override { return true; } virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override; virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override { return EINVAL; } diff --git a/Kernel/Devices/NullDevice.h b/Kernel/Devices/NullDevice.h index 5668bccbe6..a906fba13d 100644 --- a/Kernel/Devices/NullDevice.h +++ b/Kernel/Devices/NullDevice.h @@ -23,7 +23,7 @@ private: // ^CharacterDevice virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override; virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override; - virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; } + virtual bool can_write(const OpenFileDescription&, u64) const override { return true; } virtual bool can_read(const OpenFileDescription&, u64) const override; virtual StringView class_name() const override { return "NullDevice"sv; } virtual bool is_seekable() const override { return true; } diff --git a/Kernel/Devices/RandomDevice.h b/Kernel/Devices/RandomDevice.h index d9e8799960..93f523a3ea 100644 --- a/Kernel/Devices/RandomDevice.h +++ b/Kernel/Devices/RandomDevice.h @@ -24,7 +24,7 @@ private: virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override; virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override; virtual bool can_read(const OpenFileDescription&, u64) const override; - virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; } + virtual bool can_write(const OpenFileDescription&, u64) const override { return true; } virtual StringView class_name() const override { return "RandomDevice"sv; } }; diff --git a/Kernel/Devices/SerialDevice.cpp b/Kernel/Devices/SerialDevice.cpp index 573be81326..65ed9fe49f 100644 --- a/Kernel/Devices/SerialDevice.cpp +++ b/Kernel/Devices/SerialDevice.cpp @@ -77,7 +77,7 @@ ErrorOr<size_t> SerialDevice::read(OpenFileDescription&, u64, UserOrKernelBuffer }); } -bool SerialDevice::can_write(const OpenFileDescription&, size_t) const +bool SerialDevice::can_write(const OpenFileDescription&, u64) const { return (get_line_status() & EmptyTransmitterHoldingRegister) != 0; } diff --git a/Kernel/Devices/SerialDevice.h b/Kernel/Devices/SerialDevice.h index e8d78f2410..4da3c7439d 100644 --- a/Kernel/Devices/SerialDevice.h +++ b/Kernel/Devices/SerialDevice.h @@ -22,7 +22,7 @@ public: // ^CharacterDevice virtual bool can_read(const OpenFileDescription&, u64) const override; virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override; - virtual bool can_write(const OpenFileDescription&, size_t) const override; + virtual bool can_write(const OpenFileDescription&, u64) const override; virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override; void put_char(char); diff --git a/Kernel/Devices/ZeroDevice.h b/Kernel/Devices/ZeroDevice.h index 090fcf97c5..aab5633abf 100644 --- a/Kernel/Devices/ZeroDevice.h +++ b/Kernel/Devices/ZeroDevice.h @@ -24,7 +24,7 @@ private: virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override; virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override; virtual bool can_read(const OpenFileDescription&, u64) const override; - virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; } + virtual bool can_write(const OpenFileDescription&, u64) const override { return true; } virtual StringView class_name() const override { return "ZeroDevice"sv; } }; diff --git a/Kernel/FileSystem/AnonymousFile.h b/Kernel/FileSystem/AnonymousFile.h index e9af0a62e3..4703a87831 100644 --- a/Kernel/FileSystem/AnonymousFile.h +++ b/Kernel/FileSystem/AnonymousFile.h @@ -26,7 +26,7 @@ private: virtual StringView class_name() const override { return "AnonymousFile"sv; } virtual ErrorOr<NonnullOwnPtr<KString>> pseudo_path(const OpenFileDescription&) const override; virtual bool can_read(const OpenFileDescription&, u64) const override { return false; } - virtual bool can_write(const OpenFileDescription&, size_t) const override { return false; } + virtual bool can_write(const OpenFileDescription&, u64) const override { return false; } virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override { return ENOTSUP; } virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override { return ENOTSUP; } diff --git a/Kernel/FileSystem/FIFO.cpp b/Kernel/FileSystem/FIFO.cpp index a8072f1d8b..a4edad37d9 100644 --- a/Kernel/FileSystem/FIFO.cpp +++ b/Kernel/FileSystem/FIFO.cpp @@ -104,7 +104,7 @@ bool FIFO::can_read(const OpenFileDescription&, u64) const return !m_buffer->is_empty() || !m_writers; } -bool FIFO::can_write(const OpenFileDescription&, size_t) const +bool FIFO::can_write(const OpenFileDescription&, u64) const { return m_buffer->space_for_writing() || !m_readers; } diff --git a/Kernel/FileSystem/FIFO.h b/Kernel/FileSystem/FIFO.h index fe2b125fbd..106cf51080 100644 --- a/Kernel/FileSystem/FIFO.h +++ b/Kernel/FileSystem/FIFO.h @@ -44,7 +44,7 @@ private: virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override; virtual ErrorOr<struct stat> stat() const override; virtual bool can_read(const OpenFileDescription&, u64) const override; - virtual bool can_write(const OpenFileDescription&, size_t) const override; + virtual bool can_write(const OpenFileDescription&, u64) const override; virtual ErrorOr<NonnullOwnPtr<KString>> pseudo_path(const OpenFileDescription&) const override; virtual StringView class_name() const override { return "FIFO"sv; } virtual bool is_fifo() const override { return true; } diff --git a/Kernel/FileSystem/File.h b/Kernel/FileSystem/File.h index 40677d6fc1..cdc66fd9d8 100644 --- a/Kernel/FileSystem/File.h +++ b/Kernel/FileSystem/File.h @@ -82,7 +82,7 @@ public: virtual ErrorOr<void> close(); virtual bool can_read(const OpenFileDescription&, u64) const = 0; - virtual bool can_write(const OpenFileDescription&, size_t) const = 0; + virtual bool can_write(const OpenFileDescription&, u64) const = 0; virtual ErrorOr<void> attach(OpenFileDescription&); virtual void detach(OpenFileDescription&); diff --git a/Kernel/FileSystem/InodeFile.h b/Kernel/FileSystem/InodeFile.h index 90508e8b0b..478fe9347d 100644 --- a/Kernel/FileSystem/InodeFile.h +++ b/Kernel/FileSystem/InodeFile.h @@ -28,7 +28,7 @@ public: Inode& inode() { return *m_inode; } virtual bool can_read(const OpenFileDescription&, u64) const override { return true; } - virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; } + virtual bool can_write(const OpenFileDescription&, u64) const override { return true; } virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override; virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override; diff --git a/Kernel/FileSystem/InodeWatcher.h b/Kernel/FileSystem/InodeWatcher.h index 8c23c0e217..39d80652ab 100644 --- a/Kernel/FileSystem/InodeWatcher.h +++ b/Kernel/FileSystem/InodeWatcher.h @@ -47,7 +47,7 @@ public: virtual bool can_read(const OpenFileDescription&, u64) const override; virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override; // Can't write to an inode watcher. - virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; } + virtual bool can_write(const OpenFileDescription&, u64) const override { return true; } virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override { return EIO; } virtual ErrorOr<void> close() override; diff --git a/Kernel/Graphics/GenericFramebufferDevice.h b/Kernel/Graphics/GenericFramebufferDevice.h index 197bea761d..6c21041c9f 100644 --- a/Kernel/Graphics/GenericFramebufferDevice.h +++ b/Kernel/Graphics/GenericFramebufferDevice.h @@ -34,7 +34,7 @@ public: private: // ^File virtual bool can_read(const OpenFileDescription&, u64) const override final { return true; } - virtual bool can_write(const OpenFileDescription&, size_t) const override final { return true; } + virtual bool can_write(const OpenFileDescription&, u64) const override final { return true; } virtual void start_request(AsyncBlockDeviceRequest& request) override final { request.complete(AsyncDeviceRequest::Failure); } virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override { return EINVAL; } virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override { return EINVAL; } diff --git a/Kernel/Net/IPv4Socket.cpp b/Kernel/Net/IPv4Socket.cpp index 9fefdc3c72..9d7342659a 100644 --- a/Kernel/Net/IPv4Socket.cpp +++ b/Kernel/Net/IPv4Socket.cpp @@ -170,7 +170,7 @@ bool IPv4Socket::can_read(const OpenFileDescription&, u64) const return m_can_read; } -bool IPv4Socket::can_write(const OpenFileDescription&, size_t) const +bool IPv4Socket::can_write(const OpenFileDescription&, u64) const { return true; } diff --git a/Kernel/Net/IPv4Socket.h b/Kernel/Net/IPv4Socket.h index 9a04c81ecd..73c77fae53 100644 --- a/Kernel/Net/IPv4Socket.h +++ b/Kernel/Net/IPv4Socket.h @@ -38,7 +38,7 @@ public: virtual void get_local_address(sockaddr*, socklen_t*) override; virtual void get_peer_address(sockaddr*, socklen_t*) override; virtual bool can_read(const OpenFileDescription&, u64) const override; - virtual bool can_write(const OpenFileDescription&, size_t) const override; + virtual bool can_write(const OpenFileDescription&, u64) const override; virtual ErrorOr<size_t> sendto(OpenFileDescription&, const UserOrKernelBuffer&, size_t, int, Userspace<const sockaddr*>, socklen_t) override; virtual ErrorOr<size_t> recvfrom(OpenFileDescription&, UserOrKernelBuffer&, size_t, int flags, Userspace<sockaddr*>, Userspace<socklen_t*>, Time&) override; virtual ErrorOr<void> setsockopt(int level, int option, Userspace<const void*>, socklen_t) override; diff --git a/Kernel/Net/LocalSocket.cpp b/Kernel/Net/LocalSocket.cpp index 40fa8dc412..14b84ae98c 100644 --- a/Kernel/Net/LocalSocket.cpp +++ b/Kernel/Net/LocalSocket.cpp @@ -280,7 +280,7 @@ bool LocalSocket::has_attached_peer(const OpenFileDescription& description) cons return false; } -bool LocalSocket::can_write(const OpenFileDescription& description, size_t) const +bool LocalSocket::can_write(const OpenFileDescription& description, u64) const { auto role = this->role(description); if (role == Role::Accepted) diff --git a/Kernel/Net/LocalSocket.h b/Kernel/Net/LocalSocket.h index 94dc7b591c..c9643f7310 100644 --- a/Kernel/Net/LocalSocket.h +++ b/Kernel/Net/LocalSocket.h @@ -43,7 +43,7 @@ public: virtual ErrorOr<void> attach(OpenFileDescription&) override; virtual void detach(OpenFileDescription&) override; virtual bool can_read(const OpenFileDescription&, u64) const override; - virtual bool can_write(const OpenFileDescription&, size_t) const override; + virtual bool can_write(const OpenFileDescription&, u64) const override; virtual ErrorOr<size_t> sendto(OpenFileDescription&, const UserOrKernelBuffer&, size_t, int, Userspace<const sockaddr*>, socklen_t) override; virtual ErrorOr<size_t> recvfrom(OpenFileDescription&, UserOrKernelBuffer&, size_t, int flags, Userspace<sockaddr*>, Userspace<socklen_t*>, Time&) override; virtual ErrorOr<void> getsockopt(OpenFileDescription&, int level, int option, Userspace<void*>, Userspace<socklen_t*>) override; diff --git a/Kernel/Net/TCPSocket.cpp b/Kernel/Net/TCPSocket.cpp index 60bb2d949e..fe28a0b45a 100644 --- a/Kernel/Net/TCPSocket.cpp +++ b/Kernel/Net/TCPSocket.cpp @@ -614,7 +614,7 @@ void TCPSocket::retransmit_packets() }); } -bool TCPSocket::can_write(const OpenFileDescription& file_description, size_t size) const +bool TCPSocket::can_write(const OpenFileDescription& file_description, u64 size) const { if (!IPv4Socket::can_write(file_description, size)) return false; diff --git a/Kernel/Net/TCPSocket.h b/Kernel/Net/TCPSocket.h index 85f4c9ec98..607f0c628e 100644 --- a/Kernel/Net/TCPSocket.h +++ b/Kernel/Net/TCPSocket.h @@ -159,7 +159,7 @@ public: virtual ErrorOr<void> close() override; - virtual bool can_write(const OpenFileDescription&, size_t) const override; + virtual bool can_write(const OpenFileDescription&, u64) const override; static NetworkOrdered<u16> compute_tcp_checksum(IPv4Address const& source, IPv4Address const& destination, TCPPacket const&, u16 payload_size); diff --git a/Kernel/Storage/Partition/DiskPartition.cpp b/Kernel/Storage/Partition/DiskPartition.cpp index 2a294033de..77f20ce28a 100644 --- a/Kernel/Storage/Partition/DiskPartition.cpp +++ b/Kernel/Storage/Partition/DiskPartition.cpp @@ -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); diff --git a/Kernel/Storage/Partition/DiskPartition.h b/Kernel/Storage/Partition/DiskPartition.h index 92412d2c2f..79bdb64fc1 100644 --- a/Kernel/Storage/Partition/DiskPartition.h +++ b/Kernel/Storage/Partition/DiskPartition.h @@ -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; diff --git a/Kernel/Storage/StorageDevice.cpp b/Kernel/Storage/StorageDevice.cpp index 4624f6c489..54e7defa53 100644 --- a/Kernel/Storage/StorageDevice.cpp +++ b/Kernel/Storage/StorageDevice.cpp @@ -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()); } diff --git a/Kernel/Storage/StorageDevice.h b/Kernel/Storage/StorageDevice.h index 53ad1d750e..404551b69c 100644 --- a/Kernel/Storage/StorageDevice.h +++ b/Kernel/Storage/StorageDevice.h @@ -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. diff --git a/Kernel/TTY/MasterPTY.cpp b/Kernel/TTY/MasterPTY.cpp index 3ec336bc17..cebb91529d 100644 --- a/Kernel/TTY/MasterPTY.cpp +++ b/Kernel/TTY/MasterPTY.cpp @@ -79,7 +79,7 @@ bool MasterPTY::can_read(const OpenFileDescription&, u64) const return !m_buffer->is_empty(); } -bool MasterPTY::can_write(const OpenFileDescription&, size_t) const +bool MasterPTY::can_write(const OpenFileDescription&, u64) const { return true; } diff --git a/Kernel/TTY/MasterPTY.h b/Kernel/TTY/MasterPTY.h index 27eb945d5c..5b5714c6f0 100644 --- a/Kernel/TTY/MasterPTY.h +++ b/Kernel/TTY/MasterPTY.h @@ -34,7 +34,7 @@ private: virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override; virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override; virtual bool can_read(const OpenFileDescription&, u64) const override; - virtual bool can_write(const OpenFileDescription&, size_t) const override; + virtual bool can_write(const OpenFileDescription&, u64) const override; virtual ErrorOr<void> close() override; virtual bool is_master_pty() const override { return true; } virtual ErrorOr<void> ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg) override; diff --git a/Kernel/TTY/PTYMultiplexer.h b/Kernel/TTY/PTYMultiplexer.h index e3c395d32f..caac7b0fdd 100644 --- a/Kernel/TTY/PTYMultiplexer.h +++ b/Kernel/TTY/PTYMultiplexer.h @@ -27,7 +27,7 @@ public: virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override { return 0; } virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override { return 0; } virtual bool can_read(const OpenFileDescription&, u64) const override { return true; } - virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; } + virtual bool can_write(const OpenFileDescription&, u64) const override { return true; } void notify_master_destroyed(Badge<MasterPTY>, unsigned index); diff --git a/Kernel/TTY/SlavePTY.cpp b/Kernel/TTY/SlavePTY.cpp index b5a46daf8d..3c431a4158 100644 --- a/Kernel/TTY/SlavePTY.cpp +++ b/Kernel/TTY/SlavePTY.cpp @@ -85,7 +85,7 @@ ErrorOr<size_t> SlavePTY::on_tty_write(const UserOrKernelBuffer& data, size_t si return m_master->on_slave_write(data, size); } -bool SlavePTY::can_write(const OpenFileDescription&, size_t) const +bool SlavePTY::can_write(const OpenFileDescription&, u64) const { return m_master->can_write_from_slave(); } diff --git a/Kernel/TTY/SlavePTY.h b/Kernel/TTY/SlavePTY.h index 1e1cb89177..73e283c38f 100644 --- a/Kernel/TTY/SlavePTY.h +++ b/Kernel/TTY/SlavePTY.h @@ -34,7 +34,7 @@ private: // ^CharacterDevice virtual bool can_read(const OpenFileDescription&, u64) const override; virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override; - virtual bool can_write(const OpenFileDescription&, size_t) const override; + virtual bool can_write(const OpenFileDescription&, u64) const override; virtual StringView class_name() const override { return "SlavePTY"sv; } virtual ErrorOr<void> close() override; diff --git a/Kernel/TTY/TTY.cpp b/Kernel/TTY/TTY.cpp index 237f10eff4..1703e4b926 100644 --- a/Kernel/TTY/TTY.cpp +++ b/Kernel/TTY/TTY.cpp @@ -147,7 +147,7 @@ bool TTY::can_read(const OpenFileDescription&, u64) const return !m_input_buffer.is_empty(); } -bool TTY::can_write(const OpenFileDescription&, size_t) const +bool TTY::can_write(const OpenFileDescription&, u64) const { return true; } diff --git a/Kernel/TTY/TTY.h b/Kernel/TTY/TTY.h index 06dc967b43..1c49b9e1bb 100644 --- a/Kernel/TTY/TTY.h +++ b/Kernel/TTY/TTY.h @@ -24,7 +24,7 @@ public: virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override; virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override; virtual bool can_read(const OpenFileDescription&, u64) const override; - virtual bool can_write(const OpenFileDescription&, size_t) const override; + virtual bool can_write(const OpenFileDescription&, u64) const override; virtual ErrorOr<void> ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg) override final; virtual ErrorOr<NonnullOwnPtr<KString>> pseudo_path(const OpenFileDescription&) const override; |