Changeset 4979403 in mainline for uspace/srv/fs

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/srv/fs

Files:

• cdfs/cdfs.c (modified) (2 diffs)
• exfat/exfat.c (modified) (2 diffs)
• ext2fs/ext2fs.c (modified) (2 diffs)
• fat/fat.c (modified) (2 diffs)
• locfs/locfs.c (modified) (2 diffs)
• mfs/mfs.c (modified) (3 diffs)
• tmpfs/tmpfs.c (modified) (2 diffs)

uspace/srv/fs/cdfs/cdfs.c

@@ -52 +52 @@
         .concurrent_read_write = false,
         .write_retains_size = false,
+        .instance = 0,
 };
 
@@ -58 +59 @@
         printf("%s: HelenOS cdfs file system server\n", NAME);
         
+        if (argc == 3) {
+                if (!str_cmp(argv[1], "--instance"))
+                        cdfs_vfs_info.instance = strtol(argv[2], NULL, 10);
+                else {
+                        printf(NAME " Unrecognized parameters");
+                        return -1;
+                }
+        }
+
         if (!cdfs_init()) {
                 printf("%s: failed to initialize cdfs\n", NAME);

uspace/srv/fs/exfat/exfat.c

@@ -54 +54 @@
         .name = NAME,
         .concurrent_read_write = false,
-        .write_retains_size = false,    
+        .write_retains_size = false,
+        .instance = 0,
 };
 
@@ -60 +61 @@
 {
         printf(NAME ": HelenOS exFAT file system server\n");
+
+        if (argc == 3) {
+                if (!str_cmp(argv[1], "--instance"))
+                        exfat_vfs_info.instance = strtol(argv[2], NULL, 10);
+                else {
+                        printf(NAME " Unrecognized parameters");
+                        return -1;
+                }
+        }
 
         int rc = exfat_idx_init();

uspace/srv/fs/ext2fs/ext2fs.c

@@ -52 +52 @@
 vfs_info_t ext2fs_vfs_info = {
         .name = NAME,
+        .instance = 0,
 };
 
@@ -57 +58 @@
 {
         printf(NAME ": HelenOS EXT2 file system server\n");
+
+        if (argc == 3) {
+                if (!str_cmp(argv[1], "--instance"))
+                        ext2fs_vfs_info.instance = strtol(argv[2], NULL, 10);
+                else {
+                        printf(NAME " Unrecognized parameters");
+                        return -1;
+                }
+        }
         
         async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,

uspace/srv/fs/fat/fat.c

@@ -54 +54 @@
         .name = NAME,
         .concurrent_read_write = false,
-        .write_retains_size = false,    
+        .write_retains_size = false,
+        .instance = 0,
 };
 
@@ -61 +62 @@
         printf(NAME ": HelenOS FAT file system server\n");
         
+        if (argc == 3) {
+                if (!str_cmp(argv[1], "--instance"))
+                        fat_vfs_info.instance = strtol(argv[2], NULL, 10);
+                else {
+                        printf(NAME " Unrecognized parameters");
+                        return -1;
+                }
+        }
+
         int rc = fat_idx_init();
         if (rc != EOK)

uspace/srv/fs/locfs/locfs.c

@@ -55 +55 @@
         .concurrent_read_write = false,
         .write_retains_size = false,
+        .instance = 0,
 };
 
@@ -61 +62 @@
         printf("%s: HelenOS Device Filesystem\n", NAME);
         
+        if (argc == 3) {
+                if (!str_cmp(argv[1], "--instance"))
+                        locfs_vfs_info.instance = strtol(argv[2], NULL, 10);
+                else {
+                        printf(NAME " Unrecognized parameters");
+                        return -1;
+                }
+        }
+
+
         if (!locfs_init()) {
                 printf("%s: failed to initialize locfs\n", NAME);

uspace/srv/fs/mfs/mfs.c

@@ -39 +39 @@
 
 #include <ipc/services.h>
+#include <stdlib.h>
+#include <str.h>
 #include <ns.h>
 #include <async.h>
@@ -52 +54 @@
         .concurrent_read_write = false,
         .write_retains_size = false,
+        .instance = 0,
 };
 
@@ -59 +62 @@
 
         printf(NAME ": HelenOS Minix file system server\n");
+
+        if (argc == 3) {
+                if (!str_cmp(argv[1], "--instance"))
+                        mfs_vfs_info.instance = strtol(argv[2], NULL, 10);
+                else {
+                        printf(NAME " Unrecognized parameters");
+                        rc = -1;
+                        goto err;
+                }
+        }
 
         async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,

uspace/srv/fs/tmpfs/tmpfs.c

@@ -59 +59 @@
         .concurrent_read_write = false,
         .write_retains_size = false,
+        .instance = 0,
 };
 
@@ -64 +65 @@
 {
         printf(NAME ": HelenOS TMPFS file system server\n");
+
+        if (argc == 3) {
+                if (!str_cmp(argv[1], "--instance"))
+                        tmpfs_vfs_info.instance = strtol(argv[2], NULL, 10);
+                else {
+                        printf(NAME " Unrecognized parameters");
+                        return -1;
+                }
+        }
         
         if (!tmpfs_init()) {