Changeset 8b86ed26 in mainline

Timestamp:

2011-03-18T19:44:01Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

44c0f5b

Parents:

fcce9e1

Message:

the inode table position depends from the zone and inode bitmap size

File:

• uspace/srv/fs/minixfs/mfs_inode.c (modified) (3 diffs)

uspace/srv/fs/minixfs/mfs_inode.c

@@ -1 +1 @@
 #include <stdlib.h>
+#include <assert.h>
 #include <mem.h>
 #include "mfs.h"
@@ -21 +22 @@
 
         sbi = instance->sbi;
+        assert(sbi);
 
-        block_get(&b, instance->handle, 2 + inum / V1_INODES_PER_BLOCK,
+        const int itable_off = 2 + sbi->ibmap_blocks + sbi->zbmap_blocks;
+
+        block_get(&b, instance->handle, itable_off + inum / V1_INODES_PER_BLOCK,
                         BLOCK_FLAGS_NONE);
 
@@ -59 +63 @@
 
         sbi = instance->sbi;
+        assert(sbi);
 
+        const int itable_off = 2 + sbi->ibmap_blocks + sbi->zbmap_blocks;
         const int ino_off = inum % V3_INODES_PER_BLOCK(sbi->block_size);
 
         block_get(&b, instance->handle, 
-                        2 + inum / V3_INODES_PER_BLOCK(sbi->block_size),
-                        BLOCK_FLAGS_NONE);
+                itable_off + inum / V3_INODES_PER_BLOCK(sbi->block_size),
+                BLOCK_FLAGS_NONE);
 
         memcpy(ino, ((uint8_t *)b->data) + ino_off * ino_size, ino_size);