Changeset 03362fbd in mainline for uspace/srv/fs/mfs/mfs.h

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/srv/fs/mfs/mfs.h (modified) (2 diffs)

uspace/srv/fs/mfs/mfs.h

@@ -36 +36 @@
 #include <minix.h>
 #include <macros.h>
-#include <libblock.h>
+#include <block.h>
 #include <libfs.h>
 #include <adt/list.h>
@@ -142 +142 @@
         unsigned refcnt;
         fs_node_t *fsnode;
-        link_t link;
+        ht_link_t link;
 };