Changeset 340b5690 in mainline

Timestamp:

2011-03-09T20:26:46Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bb0db564

Parents:

7df022e5

Message:

Fix inode table initialization

Location:

uspace

Files:

• app/mkminix/mkminix.c (modified) (8 diffs)
• lib/minix/minix.h (modified) (1 diff)

uspace/app/mkminix/mkminix.c

@@ -59 +59 @@
 #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))
 
 typedef enum {
@@ -317 +318 @@
         uint8_t *itable_buf;
         int rc;
-        long itable_pos = 2 + sb->zbmap_blocks + sb->ibmap_blocks;
+        long itable_off;
+
+        itable_off = FIRST_ZONE(sb->block_size);
+        itable_off += sb->zbmap_blocks + sb->ibmap_blocks;
+
+        /*Convert to 1K offset*/
+        itable_off *= sb->block_size / MFS_MIN_BLOCKSIZE;
 
         itable_buf = malloc(sb->block_size);
@@ -326 +333 @@
         memset(itable_buf, 0x00, sb->block_size);
 
-        const int chunks = sb->block_size / MFS_BLOCKSIZE;
-
-        for (i = 0; i < sb->itable_size; ++i, itable_pos += chunks) {
-                rc = block_write_direct(sb->handle, itable_pos, chunks, itable_buf);
+        for (i = 0; i < sb->itable_size * (sb->block_size / MFS_MIN_BLOCKSIZE); ++i, ++itable_off) {
+                rc = block_write_direct(sb->handle, itable_off, 1, itable_buf);
 
                 if (rc != EOK)
@@ -342 +347 @@
 {
         struct mfs_inode *ino_buf;
-        const long itable_pos = 2 + sb->zbmap_blocks + sb->ibmap_blocks;
-        int rc;
+        long itable_off;
+        int rc;
+
+        itable_off = FIRST_ZONE(MFS_BLOCKSIZE);
+        itable_off += sb->zbmap_blocks + sb->ibmap_blocks;
 
         const time_t sec = time(NULL);
@@ -362 +370 @@
         ino_buf[MFS_ROOT_INO].i_dzone[0] = sb->first_data_zone;
 
-        rc = block_write_direct(sb->handle, itable_pos, 1, ino_buf);
+        rc = block_write_direct(sb->handle, itable_off, 1, ino_buf);
 
         free(ino_buf);
@@ -371 +379 @@
 {
         struct mfs2_inode *ino_buf;
-        const size_t bufsize = MFS_MIN_BLOCKSIZE;
-        const long itable_pos = 2 + sb->zbmap_blocks + sb->ibmap_blocks;
-        int rc;
+        long itable_off;
+        int rc;
+
+        itable_off = FIRST_ZONE(sb->block_size);
+        itable_off += sb->zbmap_blocks + sb->ibmap_blocks;
+
+        /*Convert to 1K block offset*/
+        itable_off *= sb->block_size / MFS_MIN_BLOCKSIZE;
 
         const time_t sec = time(NULL);
 
-        ino_buf = (struct mfs2_inode *) malloc(bufsize);
+        ino_buf = (struct mfs2_inode *) malloc(MFS_MIN_BLOCKSIZE);
 
         if (!ino_buf)
                 return ENOMEM;
 
-        memset(ino_buf, 0x00, bufsize);
+        memset(ino_buf, 0x00, MFS_MIN_BLOCKSIZE);
 
         ino_buf[MFS_ROOT_INO].i_mode = S_IFDIR;
@@ -394 +407 @@
         ino_buf[MFS_ROOT_INO].i_dzone[0] = sb->first_data_zone;
 
-        rc = block_write_direct(sb->handle, itable_pos * (sb->block_size / MFS_MIN_BLOCKSIZE), 1, ino_buf);
+        rc = block_write_direct(sb->handle, itable_off, 1, ino_buf);
 
         free(ino_buf);
@@ -442 +455 @@
         sb->ibmap_blocks = UPPER(sb->n_inodes, sb->block_size * 8);
 
+        /*Compute inode table size*/
+        sb->itable_size = sb->n_inodes / sb->ino_per_block;
+
         /*Compute zone bitmap size in blocks*/
         sb->zbmap_blocks = UPPER(sb->n_zones, sb->block_size * 8);
 
-        /*Compute inode table size*/
-        sb->itable_size = sb->n_inodes / sb->ino_per_block;
-
         /*Compute first data zone position*/
-        sb->first_data_zone = 2 + sb->itable_size + 
+        sb->first_data_zone = FIRST_ZONE(sb->block_size) + sb->itable_size + 
                                 sb->zbmap_blocks + sb->ibmap_blocks;
 

uspace/lib/minix/minix.h

@@ -48 +48 @@
 #define MFS_SUPERBLOCK          1
 #define MFS_SUPERBLOCK_SIZE     1024
+#define MFS_BOOTBLOCK_SIZE      1024
 
 #define V2_NR_DIRECT_ZONES      7