Changeset 38eb0d7 in mainline

Timestamp:

2013-07-29T20:19:39Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

781408e

Parents:

736b07b (diff), 6b6f394d (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 Maurizio's changes.

File:

• uspace/srv/fs/exfat/exfat_ops.c (modified) (2 diffs)

uspace/srv/fs/exfat/exfat_ops.c

@@ -955 +955 @@
         bmap_node = (exfat_node_t *) node->data;
 
-        for (sector = 0; sector < bmap_node->size / BPS(bs); ++sector) {
+        unsigned const bmap_sectors = ROUND_UP(bmap_node->size, BPS(bs)) /
+            BPS(bs);
+
+        for (sector = 0; sector < bmap_sectors; ++sector) {
 
                 block_t *block;
@@ -961 +964 @@
                 unsigned bit;
 
-                rc = exfat_block_get_by_clst(&block, bs, service_id,
-                    bmap_node->fragmented, bmap_node->firstc, NULL, sector,
+                rc = exfat_block_get(&block, bs, bmap_node, sector,
                     BLOCK_FLAGS_NONE);
                 if (rc != EOK) {