vfs: Make FileSystem::get_name return a &str

Author: marv7000

drivers/fs/ext2/src/lib.rs

@@ -28,8 +28,8 @@ use zinnia::{
 pub struct Ext2Fs;
 
 impl FileSystem for Ext2Fs {
-    fn get_name(&self) -> &[u8] {
-        b"ext2"
+    fn get_name(&self) -> &'static str {
+        "ext2"
     }
 
     fn mount(&self, flags: MountFlags, arg: UserPtr<()>) -> EResult<Arc<Mount>> {

kernel/src/syscall/vfs.rs

@@ -1538,8 +1538,9 @@ pub fn mount(
     data_ptr: VirtAddr,
 ) -> EResult<usize> {
     let fs_type = UserCStr::new(type_ptr)
-        .as_vec(PATH_MAX)
+        .as_cstring(PATH_MAX)
         .ok_or(Errno::EFAULT)?;
+    let fs_type = fs_type.to_str().map_err(|_| Errno::EINVAL)?;
     let dir = UserCStr::new(dir_ptr)
         .as_vec(PATH_MAX)
         .ok_or(Errno::EFAULT)?;

kernel/src/vfs/fs/devtmpfs.rs

@@ -12,8 +12,8 @@ static DEV_MOUNT: Once<Arc<Mount>> = Once::new();
 struct DevTmpFs;
 
 impl FileSystem for DevTmpFs {
-    fn get_name(&self) -> &'static [u8] {
-        b"devtmpfs"
+    fn get_name(&self) -> &str {
+        "devtmpfs"
     }
 
     fn mount(&self, flags: MountFlags, _: UserPtr<()>) -> EResult<Arc<Mount>> {
@@ -31,12 +31,8 @@ pub fn DEVTMPFS_STAGE() {
     super::register(&DevTmpFs);
 
     // Ask for a singleton-like tmpfs.
-    let tmpfs = super::mount(
-        b"tmpfs",
-        MountFlags::empty(),
-        UserPtr::new(VirtAddr::null()),
-    )
-    .expect("Unable to create devtmpfs from tmpfs");
+    let tmpfs = super::mount("tmpfs", MountFlags::empty(), UserPtr::new(VirtAddr::null()))
+        .expect("Unable to create devtmpfs from tmpfs");
 
     unsafe { DEV_MOUNT.init(tmpfs) };
 }

kernel/src/vfs/fs/mod.rs

@@ -46,7 +46,7 @@ bitflags::bitflags! {
 
 pub trait FileSystem: Sync + Send {
     /// Returns an identifier which can be used to determine this file system.
-    fn get_name(&self) -> &[u8];
+    fn get_name(&self) -> &str;
 
     /// Mounts an instance of this file system from a `source`.
     /// Returns a reference to the mount point with an instance of this file system.
@@ -65,17 +65,14 @@ pub trait SuperBlock: Sync + Send + Any {
 }
 
 /// A map of all known and registered file systems.
-static FS_TABLE: SpinMutex<BTreeMap<&'static [u8], &'static dyn FileSystem>> =
+static FS_TABLE: SpinMutex<BTreeMap<&'static str, &'static dyn FileSystem>> =
     SpinMutex::new(BTreeMap::new());
 
 /// Registers a new file system.
 pub fn register(fs: &'static dyn FileSystem) {
     let name = fs.get_name();
     FS_TABLE.lock().insert(name, fs);
-    log!(
-        "Registered new file system \"{}\"",
-        String::from_utf8_lossy(name)
-    );
+    log!("Registered new file system \"{name}\"");
 }
 
 static MOUNTED_SUPERS: SpinMutex<Vec<Arc<dyn SuperBlock>>> = SpinMutex::new(Vec::new());
@@ -92,7 +89,7 @@ pub fn sync_all() -> EResult<()> {
 }
 
 /// Mounts a file system at path `source` on `target`.
-pub fn mount(fs_name: &[u8], flags: MountFlags, arg: UserPtr<()>) -> EResult<Arc<Mount>> {
+pub fn mount(fs_name: &str, flags: MountFlags, arg: UserPtr<()>) -> EResult<Arc<Mount>> {
     let fs = {
         let table = FS_TABLE.lock();
         *table.get(fs_name).ok_or(Errno::ENODEV)?

kernel/src/vfs/fs/tmpfs.rs

@@ -27,8 +27,8 @@ use core::{
 struct TmpFs;
 
 impl FileSystem for TmpFs {
-    fn get_name(&self) -> &'static [u8] {
-        b"tmpfs"
+    fn get_name(&self) -> &str {
+        "tmpfs"
     }
 
     fn mount(&self, flags: MountFlags, _: UserPtr<()>) -> EResult<Arc<Mount>> {

kernel/src/vfs/mod.rs

@@ -292,12 +292,8 @@ pub fn get_dir_entries(
 )]
 pub fn VFS_STAGE() {
     // Mount a tmpfs as root.
-    let tmpfs = fs::mount(
-        b"tmpfs",
-        MountFlags::empty(),
-        UserPtr::new(VirtAddr::null()),
-    )
-    .expect("Unable to mount the root tmpfs");
+    let tmpfs = fs::mount("tmpfs", MountFlags::empty(), UserPtr::new(VirtAddr::null()))
+        .expect("Unable to mount the root tmpfs");
 
     let root_path = PathNode {
         entry: tmpfs.root.clone(),
@@ -314,7 +310,7 @@ pub fn VFS_STAGE() {
 pub fn VFS_DEV_MOUNT_STAGE() {
     // Mount the devtmpfs on `/dev`.
     let devtmpfs = fs::mount(
-        b"devtmpfs",
+        "devtmpfs",
         MountFlags::empty(),
         UserPtr::new(VirtAddr::null()),
     )