Changeset eb87adb in mainline for uspace/srv/fs/ext2fs/ext2fs.c

Timestamp:

2011-09-24T20:25:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d03da17

Parents:

4093b14 (diff), f1a9e87 (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/ext2fs/ext2fs.c (modified) (2 diffs)

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,