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

FileSystem: Don't perform path resolution twice for open() with O_CREAT.

Browse source
This commit is contained in:
Andreas Kling 2019-06-09 19:52:03 +02:00
parent 51d70996ba
commit 487909dd7b
2 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Kernel/FileSystem/VirtualFileSystem.cpp
View file

@ -151,10 +151,16 @@ KResult VFS::stat(StringView path, int options, Custody& base, struct stat& stat
KResultOr<Retained<FileDescription>> VFS::open(StringView path, int options, mode_t mode, Custody& base) KResultOr<Retained<FileDescription>> VFS::open(StringView path, int options, mode_t mode, Custody& base)
{ {
auto custody_or_error = resolve_path(path, base, nullptr, options); RetainPtr<Custody> parent_custody;
auto custody_or_error = resolve_path(path, base, &parent_custody, options);
if (options & O_CREAT) { if (options & O_CREAT) {
if (custody_or_error.is_error()) if (!parent_custody)
return create(path, options, mode, base); return KResult(-ENOENT);
if (custody_or_error.is_error()) {
if (custody_or_error.error() != -ENOENT)
return custody_or_error.error();
return create(path, options, mode, *parent_custody);
}
if (options & O_EXCL) if (options & O_EXCL)
return KResult(-EEXIST); return KResult(-EEXIST);
} }
@ -224,7 +230,7 @@ KResult VFS::mknod(StringView path, mode_t mode, dev_t dev, Custody& base)
return KSuccess; return KSuccess;
} }
KResultOr<Retained<FileDescription>> VFS::create(StringView path, int options, mode_t mode, Custody& base) KResultOr<Retained<FileDescription>> VFS::create(StringView path, int options, mode_t mode, Custody& parent_custody)
{ {
(void)options; (void)options;
@ -233,18 +239,9 @@ KResultOr<Retained<FileDescription>> VFS::create(StringView path, int options, m
mode |= 0100000; mode |= 0100000;
} }
RetainPtr<Custody> parent_custody; auto& parent_inode = parent_custody.inode();
auto existing_custody_or_error = resolve_path(path, base, &parent_custody);
if (!existing_custody_or_error.is_error())
return KResult(-EEXIST);
if (!parent_custody)
return KResult(-ENOENT);
auto& parent_inode = parent_custody->inode();
if (existing_custody_or_error.error() != -ENOENT)
return existing_custody_or_error.error();
if (!parent_inode.metadata().may_write(current->process())) if (!parent_inode.metadata().may_write(current->process()))
return KResult(-EACCES); return KResult(-EACCES);
FileSystemPath p(path); FileSystemPath p(path);
dbgprintf("VFS::create_file: '%s' in %u:%u\n", p.basename().characters(), parent_inode.fsid(), parent_inode.index()); dbgprintf("VFS::create_file: '%s' in %u:%u\n", p.basename().characters(), parent_inode.fsid(), parent_inode.index());
int error; int error;
@ -252,7 +249,7 @@ KResultOr<Retained<FileDescription>> VFS::create(StringView path, int options, m
if (!new_file) if (!new_file)
return KResult(error); return KResult(error);
auto new_custody = Custody::create(parent_custody, p.basename(), *new_file); auto new_custody = Custody::create(&parent_custody, p.basename(), *new_file);
return FileDescription::create(*new_custody); return FileDescription::create(*new_custody);
} }

2
Kernel/FileSystem/VirtualFileSystem.h
View file

@ -61,7 +61,7 @@ public:
KResultOr<Retained<FileDescription>> open(RetainPtr<Device>&&, int options); KResultOr<Retained<FileDescription>> open(RetainPtr<Device>&&, int options);
KResultOr<Retained<FileDescription>> open(StringView path, int options, mode_t mode, Custody& base); KResultOr<Retained<FileDescription>> open(StringView path, int options, mode_t mode, Custody& base);
KResultOr<Retained<FileDescription>> create(StringView path, int options, mode_t mode, Custody& base); KResultOr<Retained<FileDescription>> create(StringView path, int options, mode_t mode, Custody& parent_custody);
KResult mkdir(StringView path, mode_t mode, Custody& base); KResult mkdir(StringView path, mode_t mode, Custody& base);
KResult link(StringView old_path, StringView new_path, Custody& base); KResult link(StringView old_path, StringView new_path, Custody& base);
KResult unlink(StringView path, Custody& base); KResult unlink(StringView path, Custody& base);