Changeset fde8a27 in mainline for uspace/srv/fs/minixfs/mfs_utils.c

Timestamp:

2011-03-28T19:17:31Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1f1cc9d

Parents:

ef76d72

Message:

Fix bug when reading inodes that causes on-disk structures corruption if the
endianness is not native.

File:

• uspace/srv/fs/minixfs/mfs_utils.c (modified) (2 diffs)

uspace/srv/fs/minixfs/mfs_utils.c

@@ -65 +65 @@
  *content to the native endian format.
  */
-int read_ind_block(block_t *b, struct mfs_instance *inst, uint32_t block)
+int
+read_ind_block(void *data, struct mfs_instance *inst,
+                        uint32_t block, mfs_version_t version)
 {
         int rc;
         unsigned i;
+        block_t *b;
+        uint32_t *ptr32;
+        uint16_t *ptr16;
 
         assert(inst);
@@ -79 +84 @@
 
         if (rc != EOK)
-                return rc;
+                goto out;
 
-        if (sbi->fs_version == MFS_VERSION_V1) {
-                uint16_t *pt16 = b->data;
+        if (version == MFS_VERSION_V1) {
+                uint16_t *p = b->data;
+                ptr16 = data;
+                for (i = 0; i < sbi->block_size / sizeof(uint16_t); ++i)
+                        ptr16[i] = conv16(sbi->native, p[i]);
+        } else {
+                uint32_t *p = b->data;
+                ptr32 = data;
+                for (i = 0; i < sbi->block_size / sizeof(uint32_t); ++i)
+                        ptr32[i] = conv32(sbi->native, p[i]);
 
-                for (i = 0; i < MFS_BLOCKSIZE / sizeof(uint16_t); ++i)
-                        pt16[i] = conv16(sbi->native, pt16[i]);
-        } else {
-                uint32_t *pt32 = b->data;
-
-                for (i = 0; i < sbi->block_size / sizeof(uint32_t); ++i)
-                        pt32[i] = conv32(sbi->native, pt32[i]);
         }
 
-        return EOK;
+        rc = EOK;
+
+out:
+        block_put(b);
+        return rc;
 }