[chore] Update Cargo.lock for ctor_bare

arceos-org · Nov 21, 2024 · aabfe88 · aabfe88
1 parent 5ccc2bf
commit aabfe88
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 28 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api/arceos_posix_api/Cargo.toml b/api/arceos_posix_api/Cargo.toml
@@ -52,7 +52,6 @@ flatten_objects = "0.1"
 static_assertions = "1.1.0"
 spin = { version = "0.9" }
 lazy_static = { version = "1.5", features = ["spin_no_std"] }
-crate_interface = "0.1"
 ctor_bare = "0.1"
 
 [build-dependencies]

diff --git a/modules/axfs/src/fops.rs b/modules/axfs/src/fops.rs
@@ -17,12 +17,8 @@ pub type FileType = axfs_vfs::VfsNodeType;
 pub type DirEntry = axfs_vfs::VfsDirEntry;
 /// Alias of [`axfs_vfs::VfsNodeAttr`].
 pub type FileAttr = axfs_vfs::VfsNodeAttr;
-/// Alias of [`axfs_vfs::VfsNodeAttr`].
-pub type DirAttr = axfs_vfs::VfsNodeAttr;
 /// Alias of [`axfs_vfs::VfsNodePerm`].
 pub type FilePerm = axfs_vfs::VfsNodePerm;
-/// Alias of [`axfs_vfs::VfsNodePerm`].
-pub type DirPerm = axfs_vfs::VfsNodePerm;
 
 /// An opened file object, with open permissions and a cursor.
 pub struct File {
@@ -250,11 +246,6 @@ impl File {
     pub fn get_attr(&self) -> AxResult<FileAttr> {
         self.access_node(Cap::empty())?.get_attr()
     }
-
-    /// Gets the inode number of the file.
-    pub fn get_inode(&self) -> u64 {
-        0
-    }
 }
 
 impl Directory {
@@ -354,16 +345,6 @@ impl Directory {
     pub fn rename(&self, old: &str, new: &str) -> AxResult {
         crate::root::rename(old, new)
     }
-
-    /// Gets the directory attributes.
-    pub fn get_attr(&self) -> AxResult<DirAttr> {
-        self.access_node(Cap::empty())?.get_attr()
-    }
-
-    /// Gets the inode number of the file.
-    pub fn get_inode(&self) -> u64 {
-        0
-    }
 }
 
 impl Drop for File {

diff --git a/modules/axmm/src/lib.rs b/modules/axmm/src/lib.rs
@@ -38,6 +38,7 @@ pub fn new_kernel_aspace() -> AxResult<AddrSpace> {
     )?;
     for r in axhal::mem::memory_regions() {
         if r.size == 0 {
+            info!("Skip zero-size memory region: {:?}", r);
             continue;
         }
         aspace.map_linear(phys_to_virt(r.paddr), r.paddr, r.size, r.flags.into())?;

diff --git a/modules/axruntime/Cargo.toml b/modules/axruntime/Cargo.toml
@@ -15,7 +15,7 @@ default = []
 smp = ["axhal/smp"]
 irq = ["axhal/irq", "axtask?/irq", "percpu", "kernel_guard"]
 tls = ["axhal/tls", "axtask?/tls"]
-alloc = ["axalloc", "axns"]
+alloc = ["axalloc"]
 paging = ["axhal/paging", "axmm"]
 
 multitask = ["axtask/multitask"]
@@ -35,7 +35,6 @@ axfs = { workspace = true, optional = true }
 axnet = { workspace = true, optional = true }
 axdisplay = { workspace = true, optional = true }
 axtask = { workspace = true, optional = true }
-axns = { workspace = true, optional = true }
 
 crate_interface = "0.1"
 percpu = { version = "0.1", optional = true }