A Total Overhaul on the Lunaix's Virtual Memory Model (#26)

[lunaix-os.git] / lunaix-os / kernel / fs / mount.c

diff --git a/lunaix-os/kernel/fs/mount.c b/lunaix-os/kernel/fs/mount.c
index 12e1d4b94c273acc87df26203f8ea96c2b611711..2b996d413c8b304dfb6e7efc71454ddbd9a8c226 100644 (file)
--- a/lunaix-os/kernel/fs/mount.c
+++ b/lunaix-os/kernel/fs/mount.c
@@ -33,7 +33,7 @@ vfs_create_mount(struct v_mount* parent, struct v_dnode* mnt_point)
         llist_append(&parent->submnts, &mnt->sibmnts);
         mutex_unlock(&mnt->parent->lock);
     }
-
+    
     atomic_fetch_add(&mnt_point->ref_count, 1);
 
     return mnt;
@@ -63,8 +63,10 @@ __vfs_do_unmount(struct v_mount* mnt)
 
     mnt_chillax(mnt->parent);
 
+    mnt->mnt_point->mnt = mnt->parent;
+
     vfs_sb_free(sb);
-    vfs_d_free(mnt->mnt_point);
+    atomic_fetch_sub(&mnt->mnt_point->ref_count, 1);
     vfree(mnt);
 
     return errno;
@@ -137,7 +139,7 @@ vfs_mount_at(const char* fs_name,
         return ENOTBLK;
     }
 
-    if (mnt_point->inode && !(mnt_point->inode->itype & VFS_IFDIR)) {
+    if (mnt_point->inode && (mnt_point->inode->itype & F_MFILE)) {
         return ENOTDIR;
     }
 
@@ -170,7 +172,7 @@ vfs_mount_at(const char* fs_name,
             goto cleanup;
         }
 
-        kprintf("mount: dev=%s, fs=%s, mode=%d\n", dev_name, fs_name, options);
+        kprintf("mount: dev=%s, fs=%s, mode=%d", dev_name, fs_name, options);
 
         mnt_point->mnt->flags = options;
     } else {
@@ -180,11 +182,11 @@ vfs_mount_at(const char* fs_name,
     return errno;
 
 cleanup:
-    kprintf(KERROR "mount: dev=%s, fs=%s, mode=%d, err=%d\n",
-            dev_name,
-            fs_name,
-            options,
-            errno);
+    ERROR("mount: dev=%s, fs=%s, mode=%d, err=%d",
+          dev_name,
+          fs_name,
+          options,
+          errno);
     mnt_point->super_block = old_sb;
     vfs_sb_free(sb);
     return errno;
@@ -234,12 +236,11 @@ __DEFINE_LXSYSCALL4(int,
                     int,
                     options)
 {
-    struct v_dnode *dev, *mnt;
+    struct v_dnode *dev = NULL, *mnt = NULL;
     int errno = 0;
 
-    if ((errno = vfs_walk(__current->cwd, source, &dev, NULL, 0))) {
-        goto done;
-    }
+    // It is fine if source is not exist, as some mounting don't require it
+    vfs_walk(__current->cwd, source, &dev, NULL, 0);
 
     if ((errno = vfs_walk(__current->cwd, target, &mnt, NULL, 0))) {
         goto done;
@@ -250,13 +251,21 @@ __DEFINE_LXSYSCALL4(int,
         goto done;
     }
 
+    if (mnt->mnt->mnt_point == mnt) {
+        errno = EBUSY;
+        goto done;
+    }
+
     // By our convention.
     // XXX could we do better?
-    struct device* device = (struct device*)dev->inode->data;
+    struct device* device = NULL;
 
-    if (!(dev->inode->itype & VFS_IFVOLDEV) || !device) {
-        errno = ENOTDEV;
-        goto done;
+    if (dev) {
+        if (!(dev->inode->itype & VFS_IFVOLDEV)) {
+            errno = ENOTDEV;
+            goto done;
+        }
+        device = (struct device*)dev->inode->data;
     }
 
     errno = vfs_mount_at(fstype, device, mnt, options);