mirror of
https://github.com/asterinas/asterinas.git
synced 2025-06-24 09:53:24 +00:00
Rename systree
to aster-systree
This commit is contained in:
committed by
Tate, Hongliang Tian
parent
f720c05706
commit
54bd64269b
@ -330,9 +330,9 @@ impl From<int_to_c_enum::TryFromIntError> for Error {
|
||||
}
|
||||
}
|
||||
|
||||
impl From<systree::Error> for Error {
|
||||
fn from(err: systree::Error) -> Self {
|
||||
use systree::Error::*;
|
||||
impl From<aster_systree::Error> for Error {
|
||||
fn from(err: aster_systree::Error) -> Self {
|
||||
use aster_systree::Error::*;
|
||||
match err {
|
||||
NodeNotFound(_) => Error::new(Errno::ENOENT),
|
||||
InvalidNodeOperation(_) => Error::new(Errno::EINVAL),
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
use alloc::sync::Arc;
|
||||
|
||||
use systree::singleton as systree_singleton;
|
||||
use aster_systree::singleton as systree_singleton;
|
||||
|
||||
use crate::fs::{
|
||||
sysfs::inode::SysFsInode,
|
||||
|
@ -8,11 +8,11 @@ use alloc::{
|
||||
};
|
||||
use core::time::Duration;
|
||||
|
||||
use ostd::sync::RwLock;
|
||||
use systree::{
|
||||
use aster_systree::{
|
||||
SysAttr, SysAttrFlags, SysBranchNode, SysNode, SysNodeId, SysNodeType, SysObj, SysStr,
|
||||
SysSymlink, SysTree,
|
||||
};
|
||||
use ostd::sync::RwLock;
|
||||
|
||||
use crate::{
|
||||
events::IoEvents,
|
||||
|
@ -20,7 +20,7 @@ pub fn singleton() -> &'static Arc<SysFs> {
|
||||
|
||||
/// Initializes the SysFs singleton.
|
||||
/// Ensures that the singleton is created by calling it.
|
||||
/// Should be called during kernel filesystem initialization, *after* systree::init().
|
||||
/// Should be called during kernel filesystem initialization, *after* aster_systree::init().
|
||||
pub fn init() {
|
||||
// Ensure systree is initialized first. This should be handled by the kernel's init order.
|
||||
SYSFS_SINGLETON.call_once(|| SysFs::new());
|
||||
|
@ -11,16 +11,16 @@ use alloc::{
|
||||
};
|
||||
use core::{any::Any, fmt::Debug};
|
||||
|
||||
use aster_systree::{
|
||||
init_for_ktest, singleton as systree_singleton, Error as SysTreeError, Result as SysTreeResult,
|
||||
SysAttrFlags, SysAttrSet, SysAttrSetBuilder, SysBranchNode, SysBranchNodeFields, SysNode,
|
||||
SysNodeId, SysNodeType, SysNormalNodeFields, SysObj, SysStr, SysSymlink, SysTree,
|
||||
};
|
||||
use ostd::{
|
||||
mm::{FallibleVmRead, FallibleVmWrite, VmReader, VmWriter},
|
||||
prelude::ktest,
|
||||
sync::RwLock,
|
||||
};
|
||||
use systree::{
|
||||
init_for_ktest, singleton as systree_singleton, Error as SysTreeError, Result as SysTreeResult,
|
||||
SysAttrFlags, SysAttrSet, SysAttrSetBuilder, SysBranchNode, SysBranchNodeFields, SysNode,
|
||||
SysNodeId, SysNodeType, SysNormalNodeFields, SysObj, SysStr, SysSymlink, SysTree,
|
||||
};
|
||||
|
||||
use crate::{
|
||||
fs::{
|
||||
|
Reference in New Issue
Block a user