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

Kernel: Refactor storage stack with u64 as mmap offset

Browse source
This commit is contained in:
Jean-Baptiste Boric 2021-03-18 22:57:25 +01:00 • committed by Andreas Kling
parent 0d8c9024ee
commit 6698fd84ff
15 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/FileSystem/AnonymousFile.cpp
View file

@ -39,7 +39,7 @@ AnonymousFile::~AnonymousFile()
{
}
KResultOr<Region*> AnonymousFile::mmap(Process& process, FileDescription&, const Range& range, size_t offset, int prot, bool shared)
KResultOr<Region*> AnonymousFile::mmap(Process& process, FileDescription&, const Range& range, u64 offset, int prot, bool shared)
{
if (offset != 0)
return EINVAL;

2
Kernel/FileSystem/AnonymousFile.h
View file

@ -39,7 +39,7 @@ public:
virtual ~AnonymousFile() override;
virtual KResultOr<Region*> mmap(Process&, FileDescription&, const Range&, size_t offset, int prot, bool shared) override;
virtual KResultOr<Region*> mmap(Process&, FileDescription&, const Range&, u64 offset, int prot, bool shared) override;
private:
virtual const char* class_name() const override { return "AnonymousFile"; }

2
Kernel/FileSystem/File.cpp
View file

@ -59,7 +59,7 @@ int File::ioctl(FileDescription&, unsigned, FlatPtr)
return -ENOTTY;
}
KResultOr<Region*> File::mmap(Process&, FileDescription&, const Range&, size_t, int, bool)
KResultOr<Region*> File::mmap(Process&, FileDescription&, const Range&, u64, int, bool)
{
return ENODEV;
}

2
Kernel/FileSystem/File.h
View file

@ -114,7 +114,7 @@ public:
virtual KResultOr<size_t> read(FileDescription&, u64, UserOrKernelBuffer&, size_t) = 0;
virtual KResultOr<size_t> write(FileDescription&, u64, const UserOrKernelBuffer&, size_t) = 0;
virtual int ioctl(FileDescription&, unsigned request, FlatPtr arg);
virtual KResultOr<Region*> mmap(Process&, FileDescription&, const Range&, size_t offset, int prot, bool shared);
virtual KResultOr<Region*> mmap(Process&, FileDescription&, const Range&, u64 offset, int prot, bool shared);
virtual KResult stat(::stat&) const { return EBADF; }
virtual String absolute_path(const FileDescription&) const = 0;

2
Kernel/FileSystem/FileDescription.cpp
View file

@ -327,7 +327,7 @@ InodeMetadata FileDescription::metadata() const
return {};
}
KResultOr<Region*> FileDescription::mmap(Process& process, const Range& range, size_t offset, int prot, bool shared)
KResultOr<Region*> FileDescription::mmap(Process& process, const Range& range, u64 offset, int prot, bool shared)
{
LOCKER(m_lock);
return m_file->mmap(process, *this, range, offset, prot, shared);

2
Kernel/FileSystem/FileDescription.h
View file

@ -108,7 +108,7 @@ public:
Custody* custody() { return m_custody.ptr(); }
const Custody* custody() const { return m_custody.ptr(); }
KResultOr<Region*> mmap(Process&, const Range&, size_t offset, int prot, bool shared);
KResultOr<Region*> mmap(Process&, const Range&, u64 offset, int prot, bool shared);
bool is_blocking() const { return m_is_blocking; }
void set_blocking(bool b) { m_is_blocking = b; }

2
Kernel/FileSystem/InodeFile.cpp
View file

@ -107,7 +107,7 @@ int InodeFile::ioctl(FileDescription& description, unsigned request, FlatPtr arg
}
}
KResultOr<Region*> InodeFile::mmap(Process& process, FileDescription& description, const Range& range, size_t offset, int prot, bool shared)
KResultOr<Region*> InodeFile::mmap(Process& process, FileDescription& description, const Range& range, u64 offset, int prot, bool shared)
{
// FIXME: If PROT_EXEC, check that the underlying file system isn't mounted noexec.
RefPtr<InodeVMObject> vmobject;

2
Kernel/FileSystem/InodeFile.h
View file

@ -50,7 +50,7 @@ public:
virtual KResultOr<size_t> read(FileDescription&, u64, UserOrKernelBuffer&, size_t) override;
virtual KResultOr<size_t> write(FileDescription&, u64, const UserOrKernelBuffer&, size_t) override;
virtual int ioctl(FileDescription&, unsigned request, FlatPtr arg) override;
virtual KResultOr<Region*> mmap(Process&, FileDescription&, const Range&, size_t offset, int prot, bool shared) override;
virtual KResultOr<Region*> mmap(Process&, FileDescription&, const Range&, u64 offset, int prot, bool shared) override;
virtual String absolute_path(const FileDescription&) const override;