Changeset 0dd2717 in mainline

Timestamp:

2011-03-11T18:20:23Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

b84175a

Parents:

d3ce9515

Message:

Fix wrong use of the FIRST_ZONE macro

File:

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

uspace/app/mkminix/mkminix.c

@@ -324 +324 @@
         unsigned long itable_size;
 
-        itable_off = FIRST_ZONE(sb->block_size);
-        itable_off += sb->zbmap_blocks + sb->ibmap_blocks;
+        itable_off = sb->zbmap_blocks + sb->ibmap_blocks;
 
         /*Convert to 1K offset*/
-        itable_off = CONVERT_1K_OFF(itable_off, sb->block_size);
+        itable_off = CONVERT_1K_OFF(itable_off, sb->block_size) + 2;
         itable_size = CONVERT_1K_OFF(sb->itable_size, sb->block_size);
 
@@ -388 +387 @@
 
         /*Compute offset of the first inode table block*/
-        itable_off = FIRST_ZONE(sb->block_size);
-        itable_off += sb->zbmap_blocks + sb->ibmap_blocks;
+        itable_off = sb->zbmap_blocks + sb->ibmap_blocks;
 
         /*Convert to 1K block offset*/
-        itable_off = CONVERT_1K_OFF(itable_off, sb->block_size);
+        itable_off = CONVERT_1K_OFF(itable_off, sb->block_size) + 2;
 
         const time_t sec = time(NULL);
@@ -582 +580 @@
         zbmap_buf8 = (uint8_t *) zbmap_buf;
 
-        int start_block = FIRST_ZONE(sb->block_size);
+        int start_block = 2;
 
         for (i = 0; i < ibmap_nblocks; ++i) {
@@ -590 +588 @@
         }
 
-        start_block = FIRST_ZONE(sb->block_size) + ibmap_nblocks;
+        start_block = 2 + ibmap_nblocks;
 
         for (i = 0; i < zbmap_nblocks; ++i) {