fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2025-12-25 10:48:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kernel: Fix rename() sometimes failing to move within the same directory.

Browse Source 
It was wrong to do a reverse name lookup on the old inode after adding
a new name for it, since we might very well get the new inode instead of
the old one, depending on hash table layouts.
This commit is contained in:
Andreas Kling
2019-04-27 22:38:51 +02:00
parent 95ddca8a52
commit d32d85e133
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Kernel/FileSystem/VirtualFileSystem.cpp
View File

@@ -333,7 +333,7 @@ KResult VFS::rename(StringView old_path, StringView new_path, Inode& base)
return KSuccess;
if (new_inode->is_directory() && !old_inode->is_directory())
return KResult(-EISDIR);
auto result = new_parent_inode->remove_child(new_parent_inode->reverse_lookup(new_inode->identifier()));
auto result = new_parent_inode->remove_child(FileSystemPath(new_path).basename());
if (result.is_error())
return result;
}
@@ -342,7 +342,7 @@ KResult VFS::rename(StringView old_path, StringView new_path, Inode& base)
if (result.is_error())
return result;
result = old_parent_inode->remove_child(old_parent_inode->reverse_lookup(old_inode->identifier()));
result = old_parent_inode->remove_child(FileSystemPath(old_path).basename());
if (result.is_error())
return result;
@@ -495,8 +495,7 @@ KResult VFS::rmdir(StringView path, Inode& base)
if (result.is_error())
return result;
// FIXME: The reverse_lookup here can definitely be avoided.
return parent_inode->remove_child(parent_inode->reverse_lookup(inode->identifier()));
return parent_inode->remove_child(FileSystemPath(path).basename());
}
KResultOr<InodeIdentifier> VFS::resolve_symbolic_link(InodeIdentifier base, Inode& symlink_inode)