Correctly report rdev of device nodes

Author: Jiajie Chen

kernel/Cargo.lock

@@ -65,11 +65,11 @@ smoltcp = { git = "https://github.com/rcore-os/smoltcp", default-features = fals
 bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator" }
 rcore-memory = { path = "../crate/memory" }
 rcore-thread = { git = "https://github.com/rcore-os/rcore-thread" }
-rcore-fs = { git = "https://github.com/rcore-os/rcore-fs", rev = "22c759f4" }
-rcore-fs-sfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "22c759f4" }
-rcore-fs-ramfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "22c759f4" }
-rcore-fs-mountfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "22c759f4" }
-rcore-fs-devfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "22c759f4" }
+rcore-fs = { git = "https://github.com/rcore-os/rcore-fs", rev = "b7f7d9e" }
+rcore-fs-sfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "b7f7d9e" }
+rcore-fs-ramfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "b7f7d9e" }
+rcore-fs-mountfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "b7f7d9e" }
+rcore-fs-devfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "b7f7d9e" }
 compression = { version = "0.1.4", default-features = false, features = ["gzip"] }
 
 

kernel/Cargo.toml

@@ -1,7 +1,7 @@
 use crate::arch::consts::PHYSICAL_MEMORY_OFFSET;
+use crate::memory::phys_to_virt;
 use acpi::{search_for_rsdp_bios, AcpiHandler, PhysicalMapping};
 use core::ptr::NonNull;
-use crate::memory::phys_to_virt;
 use core::slice;
 
 struct Handler;

kernel/src/arch/x86_64/acpi.rs

@@ -452,7 +452,12 @@ trait ElfExt {
 
     /// Append current ELF file as interpreter into given memory set.
     /// This will insert the interpreter it a place which is "good enough" (since ld.so should be PIC).
-    fn append_as_interpreter(&self, inode: &Arc<dyn INode>, memory_set: &mut MemorySet, bias: usize);
+    fn append_as_interpreter(
+        &self,
+        inode: &Arc<dyn INode>,
+        memory_set: &mut MemorySet,
+        bias: usize,
+    );
 
     /// Get virtual address of PHDR section if it has.
     fn get_phdr_vaddr(&self) -> Option<u64>;

kernel/src/process/structs.rs

@@ -1295,7 +1295,7 @@ impl From<Metadata> for Stat {
             nlink: info.nlinks as u64,
             uid: info.uid as u32,
             gid: info.gid as u32,
-            rdev: 0,
+            rdev: info.rdev as u64,
             size: info.size as u64,
             blksize: info.blk_size as u64,
             blocks: info.blocks as u64,