Sinipelto/banan-os
1
0
Fork 0
forked from Bananymous/banan-os
Code Pull Requests Activity

Kernel+LibC: Add some errno codes

Browse Source 
Kernel now returns ENOMEM and other errnos, so we dont have to write
error messages
This commit is contained in:
Bananymous
2023-03-02 21:10:44 +02:00
parent 90a7268e5a
commit 52aa98ba25
16 changed files with 87 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
kernel/kernel/FS/Ext2.cpp
View File

@@ -228,7 +228,7 @@ namespace Kernel
BAN::ErrorOr<BAN::Vector<uint8_t>> Ext2Inode::read_all()
{
if (ifdir())
return BAN::Error::from_string("Inode is a directory");
return BAN::Error::from_errno(EISDIR);
BAN::Vector<uint8_t> data_buffer;
TRY(data_buffer.resize(m_inode.size));
@@ -256,7 +256,7 @@ namespace Kernel
BAN::ErrorOr<BAN::RefCounted<Inode>> Ext2Inode::directory_find(BAN::StringView file_name)
{
if (!ifdir())
return BAN::Error::from_string("Inode is not a directory");
return BAN::Error::from_errno(ENOTDIR);
BAN::RefCounted<Inode> result;
BAN::Function<BAN::ErrorOr<bool>(const BAN::Vector<uint8_t>&)> function(
@@ -272,7 +272,7 @@ namespace Kernel
{
Ext2Inode* inode = new Ext2Inode(m_fs, TRY(m_fs->read_inode(entry->inode)), entry_name);
if (inode == nullptr)
return BAN::Error::from_string("Could not allocate Ext2Inode");
return BAN::Error::from_errno(ENOMEM);
result = TRY(BAN::RefCounted<Inode>::adopt(inode));
return false;
}
@@ -285,13 +285,13 @@ namespace Kernel
TRY(for_each_block(function));
if (result)
return result;
return BAN::Error::from_string("Could not find the asked inode");
return BAN::Error::from_errno(ENOENT);
}
BAN::ErrorOr<BAN::Vector<BAN::RefCounted<Inode>>> Ext2Inode::directory_inodes()
{
if (!ifdir())
return BAN::Error::from_string("Inode is not a directory");
return BAN::Error::from_errno(ENOTDIR);
BAN::Vector<BAN::RefCounted<Inode>> inodes;
BAN::Function<BAN::ErrorOr<bool>(const BAN::Vector<uint8_t>&)> function(
@@ -309,7 +309,7 @@ namespace Kernel
Ext2Inode* inode = new Ext2Inode(m_fs, BAN::move(current_inode), entry_name);
if (inode == nullptr)
return BAN::Error::from_string("Could not allocate memory for Ext2Inode");
return BAN::Error::from_errno(ENOMEM);
TRY(inodes.push_back(TRY(BAN::RefCounted<Inode>::adopt(inode))));
}
entry_addr += entry->rec_len;
@@ -327,7 +327,7 @@ namespace Kernel
{
Ext2FS* ext2fs = new Ext2FS(partition);
if (ext2fs == nullptr)
return BAN::Error::from_string("Could not allocate Ext2FS");
return BAN::Error::from_errno(ENOMEM);
TRY(ext2fs->initialize_superblock());
TRY(ext2fs->initialize_block_group_descriptors());
TRY(ext2fs->initialize_root_inode());
@@ -343,7 +343,7 @@ namespace Kernel
{
uint8_t* superblock_buffer = (uint8_t*)kmalloc(1024);
if (superblock_buffer == nullptr)
return BAN::Error::from_string("Could not allocate memory for superblocks");
BAN::Error::from_errno(ENOMEM);
BAN::ScopeGuard _([superblock_buffer] { kfree(superblock_buffer); });
uint32_t lba = 1024 / sector_size;
@@ -399,7 +399,7 @@ namespace Kernel
uint8_t* block_group_descriptor_table_buffer = (uint8_t*)kmalloc(block_group_descriptor_table_sector_count * sector_size);
if (block_group_descriptor_table_buffer == nullptr)
return BAN::Error::from_string("Could not allocate memory for block group descriptor table");
return BAN::Error::from_errno(ENOMEM);
BAN::ScopeGuard _([block_group_descriptor_table_buffer] { kfree(block_group_descriptor_table_buffer); });
TRY(m_partition.read_sectors(
@@ -428,12 +428,11 @@ namespace Kernel
BAN::ErrorOr<void> Ext2FS::initialize_root_inode()
{
Ext2Inode* root_inode = new Ext2Inode(this, TRY(read_inode(Ext2::Enum::ROOT_INO)), "");
if (root_inode == nullptr)
return BAN::Error::from_string("Could not allocate Ext2Inode");
return BAN::Error::from_errno(ENOMEM);
m_root_inode = TRY(BAN::RefCounted<Inode>::adopt(root_inode));
#if EXT2_DEBUG_PRINT
dprintln("root inode:");
dprintln(" created {}", ext2_root_inode().ctime);

2
kernel/kernel/FS/VirtualFileSystem.cpp
View File

@@ -15,7 +15,7 @@ namespace Kernel
ASSERT(s_instance == nullptr);
s_instance = new VirtualFileSystem();
if (s_instance == nullptr)
return BAN::Error::from_string("Could not allocate the Virtual File System");
return BAN::Error::from_errno(ENOMEM);
return s_instance->initialize_impl();
}

3
kernel/kernel/Shell.cpp
View File

@@ -271,9 +271,6 @@ argument_done:
return TTY_PRINTLN("{}", directory_or_error.error());
auto directory = directory_or_error.release_value();
if (!directory->ifdir())
return TTY_PRINTLN("Given path does not point to a directory");
auto inodes_or_error = directory->directory_inodes();
if (inodes_or_error.is_error())
return TTY_PRINTLN("{}", inodes_or_error.error());

4
kernel/kernel/Storage/ATAController.cpp
View File

@@ -54,7 +54,7 @@ namespace Kernel
{
ATAController* controller = new ATAController(device);
if (controller == nullptr)
return BAN::Error::from_string("Could not allocate memory for ATAController");
return BAN::Error::from_errno(ENOMEM);
TRY(controller->initialize());
return controller;
}
@@ -256,7 +256,7 @@ namespace Kernel
if (status & ATA_STATUS_ERR)
return error();
if (status & ATA_STATUS_DF)
return BAN::Error::from_string("Device fault");
return BAN::Error::from_errno(EIO);
status = read(ATA_PORT_STATUS);
}