admin/iloveos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed 2 bugs in unlink

Browse Source
This commit is contained in:
FactorialN 2023-12-01 00:34:29 -08:00
parent 489997e11e
commit 8ce7f295ce
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/files.cpp
View File

@ -98,7 +98,7 @@ INode_Data* FilesOperation::create_new_inode(u_int64_t parent_inode_number, cons
DirectoryEntry ent; DirectoryEntry ent;
for(int i=0;i<=IO_BLOCK_SIZE-264;i+=264){ for(int i=0;i<=IO_BLOCK_SIZE-264;i+=264){
ent.deserialize(r_buffer+i); ent.deserialize(r_buffer+i);
if (strcmp(ent.file_name, name)==0) { if (strcmp(ent.file_name, name)==0 && ent.inode_number != 0) {
if((mode & S_IFMT) == S_IFDIR){ if((mode & S_IFMT) == S_IFDIR){
fprintf(stderr,"[%s ,%d] %s/ already exists\n",__func__,__LINE__, name); fprintf(stderr,"[%s ,%d] %s/ already exists\n",__func__,__LINE__, name);
}else{ }else{
@ -362,10 +362,15 @@ void FilesOperation::unlink_inode(u_int64_t inode_number) {
} }
} }
// TODO: This is probably incorrect // TODO: This is probably incorrect
// size is unsigned int
while(inode.metadata.size != 0) { while(inode.metadata.size != 0) {
printf("dealloc, %d\n", inode.metadata.size); printf("dealloc, %d\n", inode.metadata.size);
u_int64_t dummy; u_int64_t dummy;
fs->deallocate_datablock(&inode, &dummy); fs->deallocate_datablock(&inode, &dummy);
if (inode.metadata.size < IO_BLOCK_SIZE){
inode.metadata.size = 0;
break;
}
inode.metadata.size-=IO_BLOCK_SIZE; inode.metadata.size-=IO_BLOCK_SIZE;
} }
fs->inode_manager->free_inode(&inode); fs->inode_manager->free_inode(&inode);
@ -403,6 +408,7 @@ int FilesOperation::fischl_unlink(const char* path) {
if (strcmp(ent.file_name, filename)==0) { if (strcmp(ent.file_name, filename)==0) {
target_inode = ent.inode_number; target_inode = ent.inode_number;
ent.inode_number = 0; ent.inode_number = 0;
memset(ent.file_name, 0, sizeof(ent.file_name));
ent.serialize(rw_buffer+i); ent.serialize(rw_buffer+i);
break; break;
} }