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

Refactor DentryMnt and fix some issues

Browse Source 
Signed-off-by: Zhenchen Wang <m202372036@hust.edu.cn>
This commit is contained in:
Zhenchen Wang
2024-04-23 16:04:31 +08:00
committed by Tate, Hongliang Tian
parent 60fa4d104a
commit 8d18a12385
38 changed files with 591 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,40 +15,40 @@ use crate::{
pub fn sys_renameat(
old_dirfd: FileDesc,
old_pathname_addr: Vaddr,
old_path_addr: Vaddr,
new_dirfd: FileDesc,
new_pathname_addr: Vaddr,
new_path_addr: Vaddr,
) -> Result<SyscallReturn> {
log_syscall_entry!(SYS_RENAMEAT);
let old_pathname = read_cstring_from_user(old_pathname_addr, MAX_FILENAME_LEN)?;
let new_pathname = read_cstring_from_user(new_pathname_addr, MAX_FILENAME_LEN)?;
let old_path = read_cstring_from_user(old_path_addr, MAX_FILENAME_LEN)?;
let new_path = read_cstring_from_user(new_path_addr, MAX_FILENAME_LEN)?;
debug!(
"old_dirfd = {}, old_pathname = {:?}, new_dirfd = {}, new_pathname = {:?}",
old_dirfd, old_pathname, new_dirfd, new_pathname
"old_dirfd = {}, old_path = {:?}, new_dirfd = {}, new_path = {:?}",
old_dirfd, old_path, new_dirfd, new_path
);
let current = current!();
let fs = current.fs().read();
let (old_dir_dentrymnt, old_name) = {
let old_pathname = old_pathname.to_string_lossy();
if old_pathname.is_empty() {
let old_path = old_path.to_string_lossy();
if old_path.is_empty() {
return_errno_with_message!(Errno::ENOENT, "oldpath is empty");
}
let old_fs_path = FsPath::new(old_dirfd, old_pathname.as_ref())?;
let old_fs_path = FsPath::new(old_dirfd, old_path.as_ref())?;
fs.lookup_dir_and_base_name(&old_fs_path)?
};
let old_dentrymnt = old_dir_dentrymnt.lookup(&old_name)?;
let (new_dir_dentrymnt, new_name) = {
let new_pathname = new_pathname.to_string_lossy();
if new_pathname.is_empty() {
let new_path = new_path.to_string_lossy();
if new_path.is_empty() {
return_errno_with_message!(Errno::ENOENT, "newpath is empty");
}
if new_pathname.ends_with('/') && old_dentrymnt.dentry().type_() != InodeType::Dir {
if new_path.ends_with('/') && old_dentrymnt.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('/'))?;
let new_fs_path = FsPath::new(new_dirfd, new_path.as_ref().trim_end_matches('/'))?;
fs.lookup_dir_and_base_name(&new_fs_path)?
};
@ -66,20 +66,11 @@ pub fn sys_renameat(
}
}
if !Arc::ptr_eq(
old_dir_dentrymnt.mount_node(),
new_dir_dentrymnt.mount_node(),
) {
return_errno_with_message!(Errno::EXDEV, "cannot cross mount");
}
old_dir_dentrymnt
.dentry()
.rename(&old_name, new_dir_dentrymnt.dentry(), &new_name)?;
old_dir_dentrymnt.rename(&old_name, &new_dir_dentrymnt, &new_name)?;
Ok(SyscallReturn::Return(0))
}
pub fn sys_rename(old_pathname_addr: Vaddr, new_pathname_addr: Vaddr) -> Result<SyscallReturn> {
self::sys_renameat(AT_FDCWD, old_pathname_addr, AT_FDCWD, new_pathname_addr)
pub fn sys_rename(old_path_addr: Vaddr, new_path_addr: Vaddr) -> Result<SyscallReturn> {
self::sys_renameat(AT_FDCWD, old_path_addr, AT_FDCWD, new_path_addr)
}