lzh/MentOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[WIP] While writing do not abort if you cannot read a block (it might not exist.. yet).

Browse Source
This commit is contained in:
Enrico Fraccaroli
2021-12-23 18:33:04 +01:00
parent 44e588b586
commit 74dbffcb8d
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mentos/src/fs/ext2.c
+3 -3
View File
@@ -1458,7 +1458,7 @@ static ssize_t ext2_write_inode_data(ext2_filesystem_t *fs, ext2_inode_t *inode,
// Read the real block.
if (ext2_read_inode_block(fs, inode, start_block, cache) == -1) {
pr_err("Failed to read the inode block `%d`\n", start_block);
goto free_cache_return_error;
//goto free_cache_return_error;
}
// Copy the content back to the buffer.
memcpy((uint8_t *)(((uintptr_t)cache) + ((uintptr_t)offset % fs->block_size)), buffer, size_to_write);
@@ -1473,7 +1473,7 @@ static ssize_t ext2_write_inode_data(ext2_filesystem_t *fs, ext2_inode_t *inode,
// Read the real block.
if (ext2_read_inode_block(fs, inode, block_offset, cache) == -1) {
pr_err("Failed to read the inode block `%d`\n", block_offset);
goto free_cache_return_error;
//goto free_cache_return_error;
}
if (block_offset == start_block) {
// Copy the content back to the buffer.
@@ -1492,7 +1492,7 @@ static ssize_t ext2_write_inode_data(ext2_filesystem_t *fs, ext2_inode_t *inode,
// Read the real block.
if (ext2_read_inode_block(fs, inode, end_block, cache) == -1) {
pr_err("Failed to read the inode block `%d`\n", block_offset);
goto free_cache_return_error;
//goto free_cache_return_error;
}
// Copy the content back to the buffer.
memcpy(cache, buffer + fs->block_size * blocks_read - (offset % fs->block_size), end_size);
mentos/src/kernel.c
+6 -2
View File
@@ -351,8 +351,12 @@ int kmain(boot_info_t *boot_informations)
print_ok();
vfs_file_t *file1 = vfs_open("/home/test4.txt", O_CREAT | O_EXCL, 0);
vfs_file_t *file2 = vfs_open("/home/test5.txt", O_CREAT | O_EXCL, 0);
vfs_file_t *file3 = vfs_open("/home/test6.txt", O_CREAT | O_EXCL, 0);
char buffer[512];
for (int i = 0; i < 512; ++i) {
buffer[i] = '0' + (i % 9);
}
vfs_write(file1, buffer, 0, 512);
vfs_close(file1);
while (true) {}