Changeset 6fe0bf8d in mainline for uspace/srv

Timestamp:

2011-09-23T16:09:05Z (15 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

1924bd43

Parents:

ac2c3f8f (diff), 286286c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

Location:

uspace/srv

Files:

• fs/cdfs/cdfs.c (modified) (2 diffs)
• fs/exfat/exfat.c (modified) (2 diffs)
• fs/ext2fs/ext2fs.c (modified) (2 diffs)
• fs/fat/fat.c (modified) (2 diffs)
• fs/locfs/locfs.c (modified) (2 diffs)
• fs/mfs/mfs.c (modified) (3 diffs)
• fs/tmpfs/tmpfs.c (modified) (2 diffs)
• vfs/vfs.h (modified) (1 diff)
• vfs/vfs_ops.c (modified) (3 diffs)
• vfs/vfs_register.c (modified) (3 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()) {

uspace/srv/vfs/vfs.h

@@ -171 +171 @@
 extern void vfs_exchange_release(async_exch_t *);
 
-extern fs_handle_t fs_name_to_handle(char *, bool);
+extern fs_handle_t fs_name_to_handle(unsigned int instance, char *, bool);
 extern vfs_info_t *fs_handle_to_info(fs_handle_t);
 

uspace/srv/vfs/vfs_ops.c

@@ -146 +146 @@
 
                         rindex = (fs_index_t) IPC_GET_ARG1(answer);
-                        rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
+                        rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer),
+                            IPC_GET_ARG3(answer));
                         rlnkcnt = (unsigned) IPC_GET_ARG4(answer);
                         
@@ -276 +277 @@
         
         /*
-         * For now, don't make use of ARG3, but it can be used to
-         * carry mount options in the future.
-         */
-        
+         * Instance number is passed as ARG3.
+         */
+        unsigned int instance = IPC_GET_ARG3(*request);
+
         /* We want the client to send us the mount point. */
         char *mp;
@@ -335 +336 @@
         fs_handle_t fs_handle;
 recheck:
-        fs_handle = fs_name_to_handle(fs_name, false);
+        fs_handle = fs_name_to_handle(instance, fs_name, false);
         if (!fs_handle) {
                 if (flags & IPC_FLAG_BLOCKING) {

uspace/srv/vfs/vfs_register.c

@@ -154 +154 @@
          * Check for duplicit registrations.
          */
-        if (fs_name_to_handle(fs_info->vfs_info.name, false)) {
+        if (fs_name_to_handle(fs_info->vfs_info.instance,
+            fs_info->vfs_info.name, false)) {
                 /*
                  * We already register a fs like this.
@@ -297 +298 @@
  *
  */
-fs_handle_t fs_name_to_handle(char *name, bool lock)
+fs_handle_t fs_name_to_handle(unsigned int instance, char *name, bool lock)
 {
         int handle = 0;
@@ -306 +307 @@
         list_foreach(fs_list, cur) {
                 fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link);
-                if (str_cmp(fs->vfs_info.name, name) == 0) {
+                if (str_cmp(fs->vfs_info.name, name) == 0 &&
+                    instance == fs->vfs_info.instance) {
                         handle = fs->fs_handle;
                         break;