andrey/osblog
1
0
Fork 0
mirror of https://github.com/sgmarz/osblog.git synced 2024-11-24 02:16:19 +04:00
Code Issues Projects Releases Wiki Activity

Check for a 0 zone before adding to blocks seen.

Browse Source
This commit is contained in:
Stephen Marz 2020-04-25 16:47:13 -04:00
parent 3eb61ad188
commit 018faea21e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
risc_v/src/minixfs.rs
View File

@ -196,7 +196,9 @@ impl FileSystem for MinixFileSystem {
// There are 7 direct zones in the Minix 3 file system. So, we can just read them // There are 7 direct zones in the Minix 3 file system. So, we can just read them
// one by one. Any zone that has the value 0 is skipped and we check the next // one by one. Any zone that has the value 0 is skipped and we check the next
// zones. This might happen as we start writing and truncating. // zones. This might happen as we start writing and truncating.
if inode.zones[i] == 0 {
continue;
}
// We really use this to keep track of when we need to actually start reading // We really use this to keep track of when we need to actually start reading
// But an if statement probably takes more time than just incrementing it. // But an if statement probably takes more time than just incrementing it.
if offset_block <= blocks_seen { if offset_block <= blocks_seen {
@ -204,11 +206,7 @@ impl FileSystem for MinixFileSystem {
// We need to go to the direct pointer's index. That'll give us a block INDEX. // We need to go to the direct pointer's index. That'll give us a block INDEX.
// That makes it easy since all we have to do is multiply the block size // That makes it easy since all we have to do is multiply the block size
// by whatever we get. If it's 0, we skip it and move on. // by whatever we get. If it's 0, we skip it and move on.
let zone_num = inode.zones[i]; let zone_offset = inode.zones[i] * BLOCK_SIZE;
if zone_num == 0 {
continue;
}
let zone_offset = zone_num * BLOCK_SIZE;
syc_read(desc, block_buffer.get_mut(), BLOCK_SIZE, zone_offset); syc_read(desc, block_buffer.get_mut(), BLOCK_SIZE, zone_offset);
let read_this_many = if BLOCK_SIZE - offset_byte > bytes_left { let read_this_many = if BLOCK_SIZE - offset_byte > bytes_left {