Changeset 4979403 in mainline for uspace/app

Timestamp:

2011-09-23T15:39:07Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

286286c

Parents:

8895d05

git-author:

Maurizio Lombardi <m.lombardi85@…> (2011-09-23 15:39:07)

git-committer:

Jakub Jermar <jakub@…> (2011-09-23 15:39:07)

Message:

Allow more instances of the same FS to be used.
(Thanks to Maurizio Lombardi.)

Location:

uspace/app

Files:

• bdsh/cmds/modules/mount/mount.c (modified) (3 diffs)
• init/init.c (modified) (4 diffs)

uspace/app/bdsh/cmds/modules/mount/mount.c

@@ -43 +43 @@
 static struct option const long_options[] = {
         { "help", no_argument, 0, 'h' },
+        { "instance", required_argument, 0, 'i' },
         { 0, 0, 0, 0 }
 };
@@ -68 +69 @@
         const char *dev = "";
         int rc, c, opt_ind;
+        unsigned int instance = 0;
+        bool instance_set = false;
+        char **t_argv;
 
         argc = cli_count_args(argv);
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "h", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "i:h", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
                         help_cmd_mount(HELP_LONG);
                         return CMD_SUCCESS;
+                case 'i':
+                        instance = (unsigned int) strtol(optarg, NULL, 10);
+                        instance_set = true;
+                        break;
                 }
         }
+
+        if (instance_set) {
+                argc -= 2;
+                t_argv = &argv[2];
+        } else
+                t_argv = &argv[0];
 
         if ((argc < 3) || (argc > 5)) {
@@ -86 +100 @@
         }
         if (argc > 3)
-                dev = argv[3];
+                dev = t_argv[3];
         if (argc == 5)
-                mopts = argv[4];
+                mopts = t_argv[4];
 
-        rc = mount(argv[1], argv[2], dev, mopts, 0);
+        rc = mount(t_argv[1], t_argv[2], dev, mopts, 0, instance);
         if (rc != EOK) {
                 printf("Unable to mount %s filesystem to %s on %s (rc=%d)\n",
-                    argv[1], argv[2], argv[3], rc);
+                        t_argv[1], t_argv[2], t_argv[3], rc);
                 return CMD_FAILURE;
         }

uspace/app/init/init.c

@@ -121 +121 @@
         
         int rc = mount(fstype, ROOT_MOUNT_POINT, ROOT_DEVICE, opts,
-            IPC_FLAG_BLOCKING);
+            IPC_FLAG_BLOCKING, 0);
         return mount_report("Root filesystem", ROOT_MOUNT_POINT, fstype,
             ROOT_DEVICE, rc);
@@ -138 +138 @@
 {
         int rc = mount(LOCFS_FS_TYPE, LOCFS_MOUNT_POINT, "", "",
-            IPC_FLAG_BLOCKING);
+            IPC_FLAG_BLOCKING, 0);
         return mount_report("Location service filesystem", LOCFS_MOUNT_POINT,
             LOCFS_FS_TYPE, NULL, rc);
@@ -261 +261 @@
 static bool mount_tmpfs(void)
 {
-        int rc = mount(TMPFS_FS_TYPE, TMPFS_MOUNT_POINT, "", "", 0);
+        int rc = mount(TMPFS_FS_TYPE, TMPFS_MOUNT_POINT, "", "", 0, 0);
         return mount_report("Temporary filesystem", TMPFS_MOUNT_POINT,
             TMPFS_FS_TYPE, NULL, rc);
@@ -268 +268 @@
 static bool mount_data(void)
 {
-        int rc = mount(DATA_FS_TYPE, DATA_MOUNT_POINT, DATA_DEVICE, "wtcache", 0);
+        int rc = mount(DATA_FS_TYPE, DATA_MOUNT_POINT, DATA_DEVICE, "wtcache", 0, 0);
         return mount_report("Data filesystem", DATA_MOUNT_POINT, DATA_FS_TYPE,
             DATA_DEVICE, rc);