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

Timestamp:

2011-03-29T18:03:51Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

ba5beaf

Parents:

1f1cc9d

Message:

Improves read_map() to avoid the need to call the read_ind_block() function.

File:

• uspace/srv/fs/minixfs/mfs_utils.c (modified) (1 diff)

uspace/srv/fs/minixfs/mfs_utils.c

@@ -61 +61 @@
 }
 
-/*
- *Read an indirect block from disk and convert its
- *content to the native endian format.
- */
-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);
-        devmap_handle_t handle = inst->handle;
-        struct mfs_sb_info *sbi = inst->sbi;
-
-        assert(sbi);
-
-        rc = block_get(&b, handle, block, BLOCK_FLAGS_NONE);
-
-        if (rc != EOK)
-                goto out;
-
-        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]);
-
-        }
-
-        rc = EOK;
-
-out:
-        block_put(b);
-        return rc;
-}
-
 /**
  * @}