WebSVN – HelenOS – Path Comparison – / – /trunk/uspace/ Rev 2787 and /trunk/uspace/ Rev 2788

Compare Revisions

 /trunk/uspace/app/tester/vfs/vfs1.c
 ,11 → 43,24
 char *test_vfs1(bool quiet)
 {
-    if (mount("tmpfs", "/", "nulldev0") != EOK)
-        return "mount() failed.\n";
-    if (!quiet)
-        printf("mounted tmpfs on /.\n");
+    int rc;
+    rc = mount("tmpfs", "/", "nulldev0");
+    switch (rc) {
+    case EOK:
+        if (!quiet)
+            printf("mounted tmpfs on /\n");
+        break;
+    case EBUSY:
+        if (!quiet)
+            printf("(INFO) something is already mounted on /\n");
+        break;
+    default:
+        if (!quiet)
+            printf("(INFO) IPC returned errno %d\n", rc);
+        return "mount() failed.";
+    }
     if (mkdir("/mydir", 0) != 0)
         return "mkdir() failed.\n";
     if (!quiet)

 /trunk/uspace/srv/vfs/vfs_ops.c
 ,6 → 188,15
     if (rootfs.fs_handle) {
         /* We already have the root FS. */
         rwlock_write_lock(&namespace_rwlock);
+        if ((size == 1) && (buf[0] == '/')) {
+            /* Trying to mount root FS over root FS */
+            rwlock_write_unlock(&namespace_rwlock);
+            futex_up(&rootfs_futex);
+            vfs_node_put(mr_node);
+            free(buf);
+            ipc_answer_0(rid, EBUSY);
+            return;
+        }
         rc = vfs_lookup_internal(buf, L_DIRECTORY, &mp_res, NULL);
         if (rc != EOK) {
             /* The lookup failed for some reason. */