Changeset 049d68b in mainline

Timestamp:

2013-07-12T07:59:18Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

a727fb0

Parents:

d0a1e9b6 (diff), b66ffb1 (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 with mainline changes.

File:

• uspace/app/mkmfs/mkmfs.c (modified) (1 diff)

uspace/app/mkmfs/mkmfs.c

@@ -649 +649 @@
                 mark_bmap(ibmap_buf, i, FREE);
 
-        for (i = sb->first_data_zone + 1; i < sb->n_zones; ++i)
+        for (i = 2; i < sb->n_zones; ++i)
                 mark_bmap(zbmap_buf, i, FREE);