From 7efa742a39e9646a0e88ad55b0c401c46ff0c458 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 5 Sep 2021 17:58:08 +0200 Subject: Kernel: Use TRY() in sys$stat() --- Kernel/Syscalls/stat.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'Kernel') diff --git a/Kernel/Syscalls/stat.cpp b/Kernel/Syscalls/stat.cpp index 262f5bc22e..dc601d9f08 100644 --- a/Kernel/Syscalls/stat.cpp +++ b/Kernel/Syscalls/stat.cpp @@ -29,9 +29,8 @@ KResultOr Process::sys$stat(Userspace u REQUIRE_PROMISE(rpath); auto params = TRY(copy_typed_from_user(user_params)); - auto path = get_syscall_path_argument(params.path); - if (path.is_error()) - return path.error(); + auto path = TRY(get_syscall_path_argument(params.path)); + RefPtr base; if (params.dirfd == AT_FDCWD) { base = current_directory(); @@ -45,13 +44,9 @@ KResultOr Process::sys$stat(Userspace u return EINVAL; base = base_description->custody(); } - auto metadata_or_error = VirtualFileSystem::the().lookup_metadata(path.value()->view(), *base, params.follow_symlinks ? 0 : O_NOFOLLOW_NOERROR); - if (metadata_or_error.is_error()) - return metadata_or_error.error(); - stat statbuf; - auto result = metadata_or_error.value().stat(statbuf); - if (result.is_error()) - return result; + auto metadata = TRY(VirtualFileSystem::the().lookup_metadata(path->view(), *base, params.follow_symlinks ? 0 : O_NOFOLLOW_NOERROR)); + stat statbuf = {}; + TRY(metadata.stat(statbuf)); return copy_to_user(params.statbuf, &statbuf); } -- cgit v1.2.3