Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-25 18:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add struct Path for VFS

Browse Source 
Signed-off-by: Zhenchen Wang <m202372036@hust.edu.cn>
This commit is contained in:
plucky
2024-04-09 09:30:58 +08:00
committed by Tate, Hongliang Tian
parent bc1bf4cb53
commit 6d486c6c01
39 changed files with 561 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/aster-nix/src/syscall/rename.rs
View File

@ -30,7 +30,7 @@ pub fn sys_renameat(
let current = current!();
let fs = current.fs().read();
let (old_dir_dentry, old_name) = {
let (old_dir_path, old_name) = {
let old_pathname = old_pathname.to_string_lossy();
if old_pathname.is_empty() {
return_errno_with_message!(Errno::ENOENT, "oldpath is empty");
@ -38,14 +38,14 @@ pub fn sys_renameat(
let old_fs_path = FsPath::new(old_dirfd, old_pathname.as_ref())?;
fs.lookup_dir_and_base_name(&old_fs_path)?
};
let old_dentry = old_dir_dentry.lookup(&old_name)?;
let old_path = old_dir_path.lookup(&old_name)?;
let (new_dir_dentry, new_name) = {
let (new_dir_path, new_name) = {
let new_pathname = new_pathname.to_string_lossy();
if new_pathname.is_empty() {
return_errno_with_message!(Errno::ENOENT, "newpath is empty");
}
if new_pathname.ends_with('/') && old_dentry.type_() != InodeType::Dir {
if new_pathname.ends_with('/') && old_path.dentry().type_() != InodeType::Dir {
return_errno_with_message!(Errno::ENOTDIR, "oldpath is not dir");
}
let new_fs_path = FsPath::new(new_dirfd, new_pathname.as_ref().trim_end_matches('/'))?;
@ -53,8 +53,8 @@ pub fn sys_renameat(
};
// Check abs_path
let old_abs_path = old_dentry.abs_path();
let new_abs_path = new_dir_dentry.abs_path() + "/" + &new_name;
let old_abs_path = old_path.abs_path();
let new_abs_path = new_dir_path.abs_path() + "/" + &new_name;
if new_abs_path.starts_with(&old_abs_path) {
if new_abs_path.len() == old_abs_path.len() {
return Ok(SyscallReturn::Return(0));
@ -66,7 +66,13 @@ pub fn sys_renameat(
}
}
old_dir_dentry.rename(&old_name, &new_dir_dentry, &new_name)?;
if !Arc::ptr_eq(old_dir_path.mount_node(), new_dir_path.mount_node()) {
return_errno_with_message!(Errno::EXDEV, "cannot cross mount");
}
old_dir_path
.dentry()
.rename(&old_name, new_dir_path.dentry(), &new_name)?;
Ok(SyscallReturn::Return(0))
}