Changeset cfff7a8f in mainline

Timestamp:

2011-03-17T22:37:20Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

fcce9e1

Parents:

df22c36

Message:

Fix a little bug when reading inodes from disk

File:

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

uspace/srv/fs/minixfs/mfs_inode.c

@@ -11 +11 @@
         block_t *b;
         int i;
-
+        
+        const int ino_off = inum % V1_INODES_PER_BLOCK;
         const size_t ino_size = sizeof(struct mfs_inode);
 
@@ -24 +25 @@
                         BLOCK_FLAGS_NONE);
 
-        memcpy(ino, ((uint8_t *) b->data) + inum * ino_size, ino_size);
+        memcpy(ino, ((uint8_t *) b->data) + ino_off * ino_size, ino_size);
 
         ino->i_mode = conv16(sbi->native, ino->i_mode);
@@ -59 +60 @@
         sbi = instance->sbi;
 
+        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);
 
-        memcpy(ino, ((uint8_t *)b->data) + inum * ino_size, ino_size);
+        memcpy(ino, ((uint8_t *)b->data) + ino_off * ino_size, ino_size);
 
         ino->i_mode = conv16(sbi->native, ino->i_mode);