Changeset 925a21e in mainline for uspace/srv/fs/fat/fat.c

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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/fat/fat.c (modified) (3 diffs)

uspace/srv/fs/fat/fat.c

@@ -2 +2 @@
  * Copyright (c) 2006 Martin Decky
  * Copyright (c) 2008 Jakub Jermar
+ * Copyright (c) 2011 Oleg Romanenko
  * All rights reserved.
  *
@@ -53 +54 @@
         .name = NAME,
         .concurrent_read_write = false,
-        .write_retains_size = false,    
+        .write_retains_size = false,
+        .instance = 0,
 };
 
@@ -60 +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)