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

rearrange code to reduce nesting

This commit is contained in:
ІО-23 Шмуляр Олег 2025-04-26 15:28:17 +03:00
parent ef7f9ff553
commit 4de89d57f1
1 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/fs.c
View File

@ -502,8 +502,14 @@ static int fs_remove_fname_from_directory(unsigned int dir_inode_ptr, char *fnam
f.ref_count--; f.ref_count--;
write_block(read_inode_ptr(recs[k].inode_no), (void *) &f); write_block(read_inode_ptr(recs[k].inode_no), (void *) &f);
// clear directory record inode_ptr
recs[k].inode_no = 0;
write_block(dir.blocks[i], (void *) &recs);
// if it drops to zero, nullify inode_ptr pointing to this inode // if it drops to zero, nullify inode_ptr pointing to this inode
if (!f.ref_count) { if (f.ref_count)
goto fs_remove_fname_from_directory_finish;
pr("ref_count=0, clearing inode_ptr\n"); pr("ref_count=0, clearing inode_ptr\n");
write_inode_ptr(recs[k].inode_no, 0); write_inode_ptr(recs[k].inode_no, 0);
@ -513,11 +519,13 @@ static int fs_remove_fname_from_directory(unsigned int dir_inode_ptr, char *fnam
if (fs_file_descriptions[i].inode == inode_location_cache) if (fs_file_descriptions[i].inode == inode_location_cache)
break; break;
if (i == FS_MAX_OPEN_FD) { if (i != FS_MAX_OPEN_FD) {
pr("No open fd reference inode %d, cleaning up\n", inode_location_cache); pr("Inode %d is still referenced by fd %d, not removing it\n",
inode_location_cache, i);
goto fs_remove_fname_from_directory_finish;
}
struct fs_inode f; pr("No open fd reference inode %d, cleaning up\n", inode_location_cache);
read_block(inode_location_cache, (void *) &f);
// clear blocks referenced in base inode // clear blocks referenced in base inode
for (int i = 0; i < BLOCK_ADDRESSES_PER_INODE; i++) { for (int i = 0; i < BLOCK_ADDRESSES_PER_INODE; i++) {
@ -540,15 +548,6 @@ static int fs_remove_fname_from_directory(unsigned int dir_inode_ptr, char *fnam
mark_free(ext.blocks[i]); mark_free(ext.blocks[i]);
} }
} }
} else {
pr("Inode %d is still referenced by fd %d, not removing it\n",
inode_location_cache, i);
}
}
// clear directory record inode_ptr
recs[k].inode_no = 0;
write_block(dir.blocks[i], (void *) &recs);
goto fs_remove_fname_from_directory_finish; goto fs_remove_fname_from_directory_finish;
} }