Changeset 2f60a529 in mainline

Timestamp:

2008-03-28T07:54:14Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5e790e6

Parents:

e190a89b

Message:

Return EBUSY if trying to mount something over an already mounted root FS.
(Contributed by Tim Post)

Location:

uspace

Files:

• app/tester/vfs/vfs1.c (modified) (1 diff)
• srv/vfs/vfs_ops.c (modified) (1 diff)

uspace/app/tester/vfs/vfs1.c

@@ -44 +44 @@
 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)

uspace/srv/vfs/vfs_ops.c

@@ -189 +189 @@
                 /* 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) {