Changeset 6fe0bf8d in mainline for uspace/srv/fs/mfs/mfs.c

Timestamp:

2011-09-23T16:09:05Z (14 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

File:

• uspace/srv/fs/mfs/mfs.c (modified) (3 diffs)

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,