hasslesstech
/
spz-lab4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix fs_truncate bugs

This commit is contained in:
ІО-23 Шмуляр Олег 2025-05-01 22:40:24 +03:00
parent 0a14404160
commit a90f09ff6e
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/fs.c
View File

@ -1254,7 +1254,7 @@ int fs_truncate(void *d)
// look through base inode blocks // look through base inode blocks
for (int i = 0; i < BLOCK_ADDRESSES_PER_INODE; i++, blocks_seen++) { for (int i = 0; i < BLOCK_ADDRESSES_PER_INODE; i++, blocks_seen++) {
if ((blocks_seen > new_block_amount) && (f.blocks[i])) { if ((blocks_seen >= new_block_amount) && (f.blocks[i])) {
mark_free(f.blocks[i]); mark_free(f.blocks[i]);
f.blocks[i] = 0; f.blocks[i] = 0;
} }
@ -1270,7 +1270,7 @@ int fs_truncate(void *d)
read_block(next_ext, (void *) &ext); read_block(next_ext, (void *) &ext);
for (int i = 0; i < BLOCK_ADDRESSES_PER_INODE_EXTENSION; i++, blocks_seen++) { for (int i = 0; i < BLOCK_ADDRESSES_PER_INODE_EXTENSION; i++, blocks_seen++) {
if ((blocks_seen > new_block_amount) && (ext.blocks[i])) { if ((blocks_seen >= new_block_amount) && (ext.blocks[i])) {
mark_free(ext.blocks[i]); mark_free(ext.blocks[i]);
ext.blocks[i] = 0; ext.blocks[i] = 0;
} }
@ -1281,7 +1281,11 @@ int fs_truncate(void *d)
} }
// look through inode extensions themselves // look through inode extensions themselves
int required_extensions = (f.size - BLOCK_ADDRESSES_PER_INODE) / BLOCK_ADDRESSES_PER_INODE_EXTENSION; int required_blocks_after_base_inode = (int) f.size - (int) BLOCK_ADDRESSES_PER_INODE;
int required_extensions = required_blocks_after_base_inode >= 0
? required_blocks_after_base_inode / BLOCK_ADDRESSES_PER_INODE_EXTENSION
: 0;
if ((f.size - BLOCK_ADDRESSES_PER_INODE) % BLOCK_ADDRESSES_PER_INODE_EXTENSION) if ((f.size - BLOCK_ADDRESSES_PER_INODE) % BLOCK_ADDRESSES_PER_INODE_EXTENSION)
required_extensions++; required_extensions++;
@ -1291,23 +1295,23 @@ int fs_truncate(void *d)
// zero base inode next_extension ptr // zero base inode next_extension ptr
f.next_extension = 0; f.next_extension = 0;
write_block(read_inode_ptr(file_inode_ptr), (void *) &f); write_block(read_inode_ptr(file_inode_ptr), (void *) &f);
} else {
// seek to last required extension
for (int i = 0; i < required_extensions; i++) {
if (!next_ext)
return 0;
curr_ext = next_ext;
read_block(curr_ext, (void *) &ext);
next_ext = ext.next_extension;
}
// remove next_extension ptr
ext.next_extension = 0;
write_block(curr_ext, (void *) &ext);
} }
// seek to last required extension // erase all remaining extensions
for (int i = 0; i < required_extensions; i++) {
if (!next_ext)
return 0;
curr_ext = next_ext;
read_block(next_ext, (void *) &ext);
next_ext = ext.next_extension;
}
// remove next_extension ptr
ext.next_extension = 0;
write_block(curr_ext, (void *) &ext);
// erase all extensions after this one
while (next_ext) { while (next_ext) {
mark_free(next_ext); mark_free(next_ext);
read_block(next_ext, (void *) &ext); read_block(next_ext, (void *) &ext);