Changeset 92dd5c8 in mainline for uspace/app/mkminix/mkminix.c

Timestamp:

2011-03-13T20:14:29Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

245eb02d

Parents:

ccbc5b56

Message:

Read superblock and look for a corrispondent magic number, fix first data zone calculation in mkminix

File:

• uspace/app/mkminix/mkminix.c (modified) (6 diffs)

uspace/app/mkminix/mkminix.c

@@ -58 +58 @@
 #define UPPER(n, size)                  (((n) / (size)) + (((n) % (size)) != 0))
 #define NEXT_DENTRY(p, dirsize)         (p += dirsize)
-#define FIRST_ZONE(bs)                  ((MFS_BOOTBLOCK_SIZE + MFS_SUPERBLOCK_SIZE) / (bs))
+#define FIRST_ZONE(bs)                  (1 + (bs) / MFS_MIN_BLOCKSIZE)
 #define CONVERT_1K_OFF(off, bs)         ((off) * ((bs) / MFS_MIN_BLOCKSIZE))
 
@@ -329 +329 @@
 
         /*Convert to 1K offset*/
-        itable_off = CONVERT_1K_OFF(itable_off, sb->block_size) + 2;
+        itable_off = CONVERT_1K_OFF(itable_off, sb->block_size) +
+                                        FIRST_ZONE(sb->block_size);
         itable_size = CONVERT_1K_OFF(sb->itable_size, sb->block_size);
 
@@ -392 +393 @@
 
         /*Convert to 1K block offset*/
-        itable_off = CONVERT_1K_OFF(itable_off, sb->block_size) + 2;
+        itable_off = CONVERT_1K_OFF(itable_off, sb->block_size) +
+                                        FIRST_ZONE(sb->block_size);
 
         const time_t sec = time(NULL);
@@ -468 +470 @@
 
         /*Compute first data zone position*/
-        sb->first_data_zone = FIRST_ZONE(sb->block_size) + sb->itable_size + 
+        sb->first_data_zone = 2 + sb->itable_size + 
                                 sb->zbmap_blocks + sb->ibmap_blocks;
 
@@ -582 +584 @@
         zbmap_buf8 = (uint8_t *) zbmap_buf;
 
-        int start_block = 2;
+        int start_block = FIRST_ZONE(sb->block_size);
 
         for (i = 0; i < ibmap_nblocks; ++i) {
@@ -590 +592 @@
         }
 
-        start_block = 2 + ibmap_nblocks;
+        start_block = FIRST_ZONE(sb->block_size) + ibmap_nblocks;
 
         for (i = 0; i < zbmap_nblocks; ++i) {