Changeset 00aece0 in mainline for uspace/srv/fs/tmpfs/tmpfs.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 mainline changes.

File:

• uspace/srv/fs/tmpfs/tmpfs.c (modified) (2 diffs)

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()) {