Kernel: Modify the IOCTL API to return KResult

The kernel has been gradually moving towards KResult from just bare
int's, this change migrates the IOCTL paths.
This commit is contained in:
Brian Gianforcaro 2021-07-26 03:47:25 -07:00 committed by Ali Mohammad Pur
parent 46c9b1d81c
commit de9ff0af50
Notes: sideshowbarker 2024-07-18 08:17:39 +09:00
16 changed files with 151 additions and 151 deletions

View file

@ -62,34 +62,34 @@ KResultOr<size_t> InodeFile::write(FileDescription& description, u64 offset, con
return nwritten;
}
int InodeFile::ioctl(FileDescription& description, unsigned request, Userspace<void*> arg)
KResult InodeFile::ioctl(FileDescription& description, unsigned request, Userspace<void*> arg)
{
(void)description;
switch (request) {
case FIBMAP: {
if (!Process::current()->is_superuser())
return -EPERM;
return EPERM;
auto user_block_number = static_ptr_cast<int*>(arg);
int block_number = 0;
if (!copy_from_user(&block_number, user_block_number))
return -EFAULT;
return EFAULT;
if (block_number < 0)
return -EINVAL;
return EINVAL;
auto block_address = inode().get_block_address(block_number);
if (block_address.is_error())
return block_address.error();
if (!copy_to_user(user_block_number, &block_address.value()))
return -EFAULT;
return EFAULT;
return 0;
return KSuccess;
}
default:
return -EINVAL;
return EINVAL;
}
}