summaryrefslogtreecommitdiff
path: root/Kernel/Syscalls/chown.cpp
diff options
context:
space:
mode:
authorGunnar Beutner <gbeutner@serenityos.org>2021-06-28 20:59:35 +0200
committerAndreas Kling <kling@serenityos.org>2021-06-28 22:29:28 +0200
commit2a78bf85968ebff58b4d23be43fecdbe6178adb2 (patch)
tree07daafb91a2e20fe77843c7aeb5726469cd29081 /Kernel/Syscalls/chown.cpp
parentb6435372cc91a9ce2c3f70a6d12c7f7869dfb2f0 (diff)
downloadserenity-2a78bf85968ebff58b4d23be43fecdbe6178adb2.zip
Kernel: Fix the return type for syscalls
The Process::Handler type has KResultOr<FlatPtr> as its return type. Using a different return type with an equally-sized template parameter sort of works but breaks once that condition is no longer true, e.g. for KResultOr<int> on x86_64. Ideally the syscall handlers would also take FlatPtrs as their args so we can get rid of the reinterpret_cast for the function pointer but I didn't quite feel like cleaning that up as well.
Diffstat (limited to 'Kernel/Syscalls/chown.cpp')
-rw-r--r--Kernel/Syscalls/chown.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Kernel/Syscalls/chown.cpp b/Kernel/Syscalls/chown.cpp
index bfb50a666a..97d9e50e67 100644
--- a/Kernel/Syscalls/chown.cpp
+++ b/Kernel/Syscalls/chown.cpp
@@ -9,7 +9,7 @@
namespace Kernel {
-KResultOr<int> Process::sys$fchown(int fd, uid_t uid, gid_t gid)
+KResultOr<FlatPtr> Process::sys$fchown(int fd, uid_t uid, gid_t gid)
{
REQUIRE_PROMISE(chown);
auto description = file_description(fd);
@@ -18,7 +18,7 @@ KResultOr<int> Process::sys$fchown(int fd, uid_t uid, gid_t gid)
return description->chown(uid, gid);
}
-KResultOr<int> Process::sys$chown(Userspace<const Syscall::SC_chown_params*> user_params)
+KResultOr<FlatPtr> Process::sys$chown(Userspace<const Syscall::SC_chown_params*> user_params)
{
REQUIRE_PROMISE(chown);
Syscall::SC_chown_params params;