Changeset 1564c4b in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2011-06-08T19:39:52Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

2af29ed

Parents:

e686889c (diff), 0eff68e (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

File:

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

uspace/srv/fs/fat/fat_ops.c

@@ -55 +55 @@
 #include <sys/mman.h>
 #include <align.h>
+#include <malloc.h>
 
 #define FAT_NODE(node)  ((node) ? (fat_node_t *) (node)->data : NULL)
@@ -969 +970 @@
 
         /* initialize libblock */
-        rc = block_init(devmap_handle, BS_SIZE);
+        rc = block_init(EXCHANGE_SERIALIZE, devmap_handle, BS_SIZE);
         if (rc != EOK) {
                 async_answer_0(rid, rc);