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

Kernel: Add Inode::truncate(size).

Browse source 
- Use this to implement the O_TRUNC open flag.
- Fix creat() to pass O_CREAT | O_TRUNC | O_WRONLY.
- Make sure we truncate wherever appropriate.
This commit is contained in:
Andreas Kling 2019-03-27 16:42:30 +01:00
parent e9f2cc3595
commit 0058da734e
8 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Kernel/Ext2FileSystem.cpp
View file

@ -1391,6 +1391,16 @@ KResult Ext2FSInode::chown(uid_t uid, gid_t gid)
return KSuccess;
}
KResult Ext2FSInode::truncate(int size)
{
LOCKER(m_lock);
if (m_raw_inode.i_size == size)
return KSuccess;
m_raw_inode.i_size = size;
set_metadata_dirty(true);
return KSuccess;
}
unsigned Ext2FS::total_block_count() const
{
LOCKER(m_lock);

1
Kernel/Ext2FileSystem.h
View file

@ -42,6 +42,7 @@ private:
virtual size_t directory_entry_count() const override;
virtual KResult chmod(mode_t) override;
virtual KResult chown(uid_t, gid_t) override;
virtual KResult truncate(int) override;
void populate_lookup_cache() const;

1
Kernel/FileSystem.h
View file

@ -103,6 +103,7 @@ public:
virtual size_t directory_entry_count() const = 0;
virtual KResult chmod(mode_t) = 0;
virtual KResult chown(uid_t, gid_t) = 0;
virtual KResult truncate(int) { return KSuccess; }
LocalSocket* socket() { return m_socket.ptr(); }
const LocalSocket* socket() const { return m_socket.ptr(); }

12
Kernel/VirtualFileSystem.cpp
View file

@ -170,7 +170,10 @@ KResultOr<Retained<FileDescriptor>> VFS::open(const String& path, int options, m
if (inode_or_error.is_error())
return inode_or_error.error();
auto metadata = inode_or_error.value()->metadata();
auto inode = inode_or_error.value();
auto metadata = inode->metadata();
bool should_truncate_file = false;
// NOTE: Read permission is a bit weird, since O_RDONLY == 0,
// so we check if (NOT write_only OR read_and_write)
@ -183,6 +186,7 @@ KResultOr<Retained<FileDescriptor>> VFS::open(const String& path, int options, m
return KResult(-EACCES);
if (metadata.is_directory())
return KResult(-EISDIR);
should_truncate_file = options & O_TRUNC;
}
if (metadata.is_device()) {
@ -193,10 +197,12 @@ KResultOr<Retained<FileDescriptor>> VFS::open(const String& path, int options, m
auto descriptor_or_error = (*it).value->open(options);
if (descriptor_or_error.is_error())
return descriptor_or_error.error();
descriptor_or_error.value()->set_original_inode(Badge<VFS>(), *inode_or_error.value());
descriptor_or_error.value()->set_original_inode(Badge<VFS>(), *inode);
return descriptor_or_error;
}
return FileDescriptor::create(*inode_or_error.value());
if (should_truncate_file)
inode->truncate(0);
return FileDescriptor::create(*inode);
}
KResultOr<Retained<FileDescriptor>> VFS::create(const String& path, int options, mode_t mode, Inode& base)