Changeset 930baca in mainline

Timestamp:

2011-03-19T19:15:28Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

155f792

Parents:

0d6ab10

Message:

the read_map() function returns the data block address on disk given the position into the file

Location:

uspace/srv/fs/minixfs

Files:

• Makefile (modified) (1 diff)
• mfs.h (modified) (2 diffs)
• mfs_read.c (added)
• mfs_utils.c (modified) (2 diffs)
• mfs_utils.h (modified) (1 diff)

uspace/srv/fs/minixfs/Makefile

@@ -37 +37 @@
         mfs_ops.c \
         mfs_inode.c \
+        mfs_read.c \
         mfs_utils.c
 

uspace/srv/fs/minixfs/mfs.h

@@ -74 +74 @@
         int dirsize;
         int block_size;
-        int fs_version;
+        mfs_version_t fs_version;
         uint32_t max_file_size;
         uint16_t magic;
@@ -121 +121 @@
                                         uint32_t inum);
 
+/*mfs_read.c*/
+int read_map(uint32_t *b, const struct mfs_node *mnode, const uint32_t pos);
 
 #endif

uspace/srv/fs/minixfs/mfs_utils.c

@@ -32 +32 @@
 
 #include <byteorder.h>
+#include <assert.h>
+#include <errno.h>
+#include "mfs.h"
 #include "mfs_utils.h"
 
@@ -58 +61 @@
 }
 
+/*
+ *Read an indirect block from disk and convert its
+ *content to the native endian format.
+ */
+int read_ind_block(block_t *b, struct mfs_instance *inst, uint32_t block)
+{
+        int rc;
+        unsigned i;
+
+        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)
+                return rc;
+
+        if (sbi->fs_version == MFS_VERSION_V1) {
+                uint16_t *pt16 = b->data;
+
+                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;
+}
+
 /**
  * @}

uspace/srv/fs/minixfs/mfs_utils.h

@@ -40 +40 @@
 uint32_t conv32(bool native, uint32_t n);
 uint64_t conv64(bool native, uint64_t n);
+int read_ind_block(block_t *b, struct mfs_instance *inst, uint32_t block);
 
 #endif