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

Timestamp:

2011-09-23T16:09:05Z (13 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/cdfs/cdfs.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);