Index: uspace/srv/fs/exfat/exfat_ops.c
===================================================================
--- uspace/srv/fs/exfat/exfat_ops.c	(revision 736b07b371eff9ddb7417f9783783a70634cebb4)
+++ uspace/srv/fs/exfat/exfat_ops.c	(revision 38eb0d7c6ce8f8d829f28ec2bd2ed7a121a3c531)
@@ -955,5 +955,8 @@
 	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,6 +964,5 @@
 		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) {