Changeset b6eb5da in mainline

Timestamp:

2012-02-28T20:44:30Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

9bbe54f

Parents:

2601383

Message:

mkexfat: Fix calculation of the total number of clusters on device.

File:

• uspace/app/mkexfat/mkexfat.c (modified) (3 diffs)

uspace/app/mkexfat/mkexfat.c

@@ -164 +164 @@
 
                 cfg->cluster_size <<= 1;
-                cfg->total_clusters = div_round_up(volume_bytes,
-                    cfg->cluster_size);
+                cfg->total_clusters = volume_bytes / cfg->cluster_size;
         }
 
@@ -178 +177 @@
             cfg->fat_sector_count, cfg->cluster_size / cfg->sector_size);
 
+        /* Subtract the FAT and bootsector space from the total
+         * number of available clusters.
+         */
+        cfg->total_clusters -= div_round_up((cfg->data_start_sector -
+            FAT_SECTOR_START) * cfg->sector_size,
+            cfg->cluster_size);
+
         /* Compute the bitmap size */
         cfg->bitmap_size = div_round_up(cfg->total_clusters, 8);
@@ -191 +197 @@
         cfg->allocated_clusters += div_round_up(sizeof(upcase_table),
             cfg->cluster_size);
-
-        /* Subtract the FAT and bootsector space from the total
-         * number of available clusters.
-         */
-        cfg->total_clusters -= div_round_up(cfg->data_start_sector *
-            cfg->sector_size, cfg->cluster_size);
 
         /* Will be set later */