feat(filesystem): 引入Umount系统调用

README.md

@@ -112,7 +112,7 @@
 - [谢润霖](https://github.com/xiaolin2004)
 - [蔡俊源](https://github.com/SMALLC04)
 - Kelly
-- [戴吕琛](https://github.com/Samuka007)
+- [Samuka007](https://github.com/Samuka007)
 - [杨璐玮](https://github.com/val213)
 - [何懿聪](https://github.com/GnoCiYeH)
 - [周凯韬](https://github.com/laokengwt)

README_EN.md

@@ -104,7 +104,7 @@ We guarantee that all sponsorship funds and items will be used for:
 - [谢润霖](https://github.com/xiaolin2004)
 - [蔡俊源](https://github.com/SMALLC04)
 - Kelly
-- [戴吕琛](https://github.com/Samuka007)
+- [Samuka007](https://github.com/Samuka007)
 - [杨璐玮](https://github.com/val213)
 - [何懿聪](https://github.com/GnoCiYeH)
 - [周凯韬](https://github.com/laokengwt)

docs/kernel/libs/lib_ui/scm.md

@@ -13,30 +13,30 @@
 pub trait ScmUiFramework: Sync + Send + Debug {
     // 安装ui框架的回调函数
     fn install(&self) -> Result<i32, SystemError> {
-        return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+        return Err(SystemError::ENOSYS);
     }
     // 卸载ui框架的回调函数
     fn uninstall(&self) -> Result<i32, SystemError> {
-        return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+        return Err(SystemError::ENOSYS);
     }
     // 启用ui框架的回调函数
     fn enable(&self) -> Result<i32, SystemError> {
-        return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+        return Err(SystemError::ENOSYS);
     }
     // 禁用ui框架的回调函数
     fn disable(&self) -> Result<i32, SystemError> {
-        return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+        return Err(SystemError::ENOSYS);
     }
     // 改变ui框架的帧缓冲区的回调函数
     fn change(&self, _buf: ScmBufferInfo) -> Result<i32, SystemError> {
-        return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+        return Err(SystemError::ENOSYS);
     }
     /// @brief 获取ScmUiFramework的元数据
     /// @return 成功：Ok(ScmUiFramework的元数据)
     ///         失败：Err(错误码)
     fn metadata(&self) -> Result<ScmUiFrameworkMetadata, SystemError> {
         // 若文件系统没有实现此方法，则返回“不支持”
-        return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+        return Err(SystemError::ENOSYS);
     }
 }
 ```

kernel/src/arch/x86_64/kvm/mod.rs

@@ -34,14 +34,14 @@ impl X86_64KVMArch {
         // Check to see if CPU is Intel (“GenuineIntel”).
         if let Some(vi) = cpuid.get_vendor_info() {
             if vi.as_str() != "GenuineIntel" {
-                return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+                return Err(SystemError::ENOSYS);
             }
         }
         // Check processor supports for Virtual Machine Extension (VMX) technology
         // CPUID.1:ECX.VMX[bit 5] = 1 (Intel Manual: 24.6 Discovering Support for VMX)
         if let Some(fi) = cpuid.get_feature_info() {
             if !fi.has_vmx() {
-                return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+                return Err(SystemError::ENOSYS);
             }
         }
         Ok(())

kernel/src/arch/x86_64/kvm/vmx/ept.rs

@@ -15,7 +15,7 @@ pub fn check_ept_features() -> Result<(), SystemError> {
     const MTRR_ENABLE_BIT: u64 = 1 << 11;
     let ia32_mtrr_def_type = unsafe { msr::rdmsr(msr::IA32_MTRR_DEF_TYPE) };
     if (ia32_mtrr_def_type & MTRR_ENABLE_BIT) == 0 {
-        return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+        return Err(SystemError::ENOSYS);
     }
     Ok(())
 }

kernel/src/arch/x86_64/kvm/vmx/vcpu.rs

@@ -419,7 +419,7 @@ impl Vcpu for VmxVcpu {
             }
             Err(e) => {
                 kdebug!("[-] CPU does not support Intel VMX: {:?}", e);
-                return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+                return Err(SystemError::ENOSYS);
             }
         };
 
@@ -429,7 +429,7 @@ impl Vcpu for VmxVcpu {
             }
             Err(_) => {
                 kdebug!("[-] VMX operation is not supported on this processor.");
-                return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+                return Err(SystemError::ENOSYS);
             }
         }
 
@@ -574,12 +574,12 @@ pub fn has_intel_vmx_support() -> Result<(), SystemError> {
     let cpuid = CpuId::new();
     if let Some(vi) = cpuid.get_vendor_info() {
         if vi.as_str() != "GenuineIntel" {
-            return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+            return Err(SystemError::ENOSYS);
         }
     }
     if let Some(fi) = cpuid.get_feature_info() {
         if !fi.has_vmx() {
-            return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+            return Err(SystemError::ENOSYS);
         }
     }
     Ok(())

kernel/src/driver/acpi/sysfs.rs

@@ -205,11 +205,11 @@ impl AttrAcpiTable {
 
 impl Attribute for AttrAcpiTable {
     fn show(&self, _kobj: Arc<dyn KObject>, _buf: &mut [u8]) -> Result<usize, SystemError> {
-        return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+        return Err(SystemError::ENOSYS);
     }
 
     fn store(&self, _kobj: Arc<dyn KObject>, _buf: &[u8]) -> Result<usize, SystemError> {
-        return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+        return Err(SystemError::ENOSYS);
     }
 
     fn name(&self) -> &str {
@@ -235,7 +235,7 @@ impl BinAttribute for AttrAcpiTable {
         _buf: &[u8],
         _offset: usize,
     ) -> Result<usize, SystemError> {
-        return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+        return Err(SystemError::ENOSYS);
     }
 
     /// 展示 ACPI 表的内容

kernel/src/driver/base/device/bus.rs

@@ -134,9 +134,9 @@ pub trait Bus: Debug + Send + Sync {
     ///
     /// ## 默认实现
     ///
-    /// 如果总线不支持该操作，返回`SystemError::EOPNOTSUPP_OR_ENOTSUP`
+    /// 如果总线不支持该操作，返回`SystemError::ENOSYS`
     fn probe(&self, _device: &Arc<dyn Device>) -> Result<(), SystemError> {
-        return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+        return Err(SystemError::ENOSYS);
     }
     fn remove(&self, _device: &Arc<dyn Device>) -> Result<(), SystemError>;
     fn sync_state(&self, _device: &Arc<dyn Device>) {}
@@ -750,7 +750,7 @@ impl Attribute for DriverAttrUnbind {
                 "Intertrait casting not implemented for kobj: {}",
                 kobj.name()
             );
-            SystemError::EOPNOTSUPP_OR_ENOTSUP
+            SystemError::ENOSYS
         })?;
 
         let bus = driver
@@ -799,7 +799,7 @@ impl Attribute for DriverAttrBind {
                 "Intertrait casting not implemented for kobj: {}",
                 kobj.name()
             );
-            SystemError::EOPNOTSUPP_OR_ENOTSUP
+            SystemError::ENOSYS
         })?;
 
         let bus = driver

kernel/src/driver/base/device/dd.rs

@@ -502,7 +502,7 @@ impl DriverManager {
             .and_then(|bus| bus.upgrade())
             .ok_or(SystemError::EINVAL)?;
         let r = bus.probe(device);
-        if r == Err(SystemError::EOPNOTSUPP_OR_ENOTSUP) {
+        if r == Err(SystemError::ENOSYS) {
             kerror!(
                 "call_driver_probe: bus.probe() failed, dev: '{}', err: {:?}",
                 device.name(),
@@ -592,7 +592,7 @@ impl Attribute for DeviceAttrStateSynced {
                 "Intertrait casting not implemented for kobj: {}",
                 kobj.name()
             );
-            SystemError::EOPNOTSUPP_OR_ENOTSUP
+            SystemError::ENOSYS
         })?;
 
         let val = dev.state_synced();
@@ -627,7 +627,7 @@ impl Attribute for DeviceAttrCoredump {
                 "Intertrait casting not implemented for kobj: {}",
                 kobj.name()
             );
-            SystemError::EOPNOTSUPP_OR_ENOTSUP
+            SystemError::ENOSYS
         })?;
 
         let drv = dev.driver().ok_or(SystemError::EINVAL)?;

kernel/src/driver/base/device/mod.rs

@@ -875,7 +875,7 @@ impl Attribute for DeviceAttrDev {
                 "Intertrait casting not implemented for kobj: {}",
                 kobj.name()
             );
-            SystemError::EOPNOTSUPP_OR_ENOTSUP
+            SystemError::ENOSYS
         })?;
 
         let device_number = dev.id_table().device_number();

kernel/src/driver/base/kobject.rs

@@ -146,7 +146,7 @@ impl SysFSOps for KObjectSysFSOps {
         buf: &mut [u8],
     ) -> Result<usize, SystemError> {
         let r = attr.show(kobj, buf).map_err(|e| {
-            if e == SystemError::EOPNOTSUPP_OR_ENOTSUP {
+            if e == SystemError::ENOSYS {
                 SystemError::EIO
             } else {
                 e
@@ -163,7 +163,7 @@ impl SysFSOps for KObjectSysFSOps {
         buf: &[u8],
     ) -> Result<usize, SystemError> {
         let r = attr.store(kobj, buf).map_err(|e| {
-            if e == SystemError::EOPNOTSUPP_OR_ENOTSUP {
+            if e == SystemError::ENOSYS {
                 SystemError::EIO
             } else {
                 e

kernel/src/driver/base/subsys.rs

@@ -201,7 +201,7 @@ pub trait SubSysInterface: Debug + Send + Sync {
     fn bus(&self) -> Option<Weak<dyn Bus>>;
     fn set_bus(&self, bus: Option<Weak<dyn Bus>>);
     fn add_device(&self, _device: &Arc<dyn Device>) -> Result<(), SystemError> {
-        return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+        return Err(SystemError::ENOSYS);
     }
     fn remove_device(&self, device: &Arc<dyn Device>);
 }

kernel/src/driver/disk/ahci/ahci_inode.rs

@@ -82,11 +82,11 @@ impl IndexNode for LockedAhciInode {
         _data: SpinLockGuard<FilePrivateData>,
         _mode: &FileMode,
     ) -> Result<(), SystemError> {
-        Err(SystemError::EOPNOTSUPP_OR_ENOTSUP)
+        Err(SystemError::ENOSYS)
     }
 
     fn close(&self, _data: SpinLockGuard<FilePrivateData>) -> Result<(), SystemError> {
-        Err(SystemError::EOPNOTSUPP_OR_ENOTSUP)
+        Err(SystemError::ENOSYS)
     }
 
     fn metadata(&self) -> Result<Metadata, SystemError> {
@@ -98,7 +98,7 @@ impl IndexNode for LockedAhciInode {
     }
 
     fn list(&self) -> Result<Vec<String>, SystemError> {
-        Err(SystemError::EOPNOTSUPP_OR_ENOTSUP)
+        Err(SystemError::ENOSYS)
     }
 
     fn set_metadata(&self, metadata: &Metadata) -> Result<(), SystemError> {

kernel/src/driver/input/ps2_mouse/ps_mouse_device.rs

@@ -30,8 +30,8 @@ use crate::{
         devfs::{devfs_register, DevFS, DeviceINode},
         kernfs::KernFSInode,
         vfs::{
-            core::generate_inode_id, syscall::ModeType, FilePrivateData, FileSystem, FileType,
-            IndexNode, Metadata,
+            core::generate_inode_id, syscall::ModeType, utils::DName, FilePrivateData, FileSystem,
+            FileType, IndexNode, Metadata,
         },
     },
     libs::{
@@ -627,7 +627,7 @@ impl IndexNode for Ps2MouseDevice {
         _buf: &[u8],
         _data: SpinLockGuard<FilePrivateData>,
     ) -> Result<usize, SystemError> {
-        return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+        return Err(SystemError::ENOSYS);
     }
 
     fn fs(&self) -> Arc<dyn FileSystem> {
@@ -655,6 +655,10 @@ impl IndexNode for Ps2MouseDevice {
     fn resize(&self, _len: usize) -> Result<(), SystemError> {
         Ok(())
     }
+
+    fn dname(&self) -> Result<DName, SystemError> {
+        Ok(DName::from(self.name()))
+    }
 }
 
 impl Ps2Device for Ps2MouseDevice {}

kernel/src/driver/keyboard/ps2_keyboard.rs

@@ -171,7 +171,7 @@ impl IndexNode for LockedPS2KeyBoardInode {
     }
 
     fn list(&self) -> Result<alloc::vec::Vec<alloc::string::String>, SystemError> {
-        return Err(SystemError::EOPNOTSUPP_OR_ENOTSUP);
+        return Err(SystemError::ENOSYS);
     }
 }