Changeset 155f792 in mainline for uspace/srv/fs/minixfs/mfs_inode.c

Timestamp:

2011-03-20T11:30:25Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6adba0a8

Parents:

930baca

Message:

Use a generic minixfs inode in core to avoid code duplication

File:

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

uspace/srv/fs/minixfs/mfs_inode.c

@@ -1 +1 @@
 #include <stdlib.h>
 #include <assert.h>
+#include <errno.h>
 #include <mem.h>
 #include "mfs.h"
 #include "mfs_utils.h"
 
-struct mfs_inode *mfs_read_inode_raw(const struct mfs_instance *instance, 
+struct mfs_ino_info *mfs_read_inode_raw(const struct mfs_instance *instance, 
                                         uint16_t inum)
 {
-        struct mfs_inode *ino;
+        struct mfs_inode *ino = NULL;
+        struct mfs_ino_info *ino_i = NULL;
         struct mfs_sb_info *sbi;
         block_t *b;
@@ -16 +18 @@
         const size_t ino_size = sizeof(struct mfs_inode);
 
+        ino_i = (struct mfs_ino_info *) malloc(sizeof(struct mfs_ino_info));
         ino = (struct mfs_inode *) malloc(ino_size);
 
-        if (!ino)
-                return NULL;
+        if (!ino || !ino_i)
+                goto out_err;
 
         sbi = instance->sbi;
@@ -26 +29 @@
         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);
+        if (block_get(&b, instance->handle, itable_off + inum / V1_INODES_PER_BLOCK,
+                        BLOCK_FLAGS_NONE) != EOK)
+                goto out_err;
 
         memcpy(ino, ((uint8_t *) b->data) + ino_off * ino_size, ino_size);
 
-        ino->i_mode = conv16(sbi->native, ino->i_mode);
-        ino->i_uid = conv16(sbi->native, ino->i_uid);
-        ino->i_size = conv32(sbi->native, ino->i_size);
-        ino->i_mtime = conv32(sbi->native, ino->i_mtime);
+        ino_i->i_mode = conv16(sbi->native, ino->i_mode);
+        ino_i->i_uid = conv16(sbi->native, ino->i_uid);
+        ino_i->i_size = conv32(sbi->native, ino->i_size);
+        ino_i->i_mtime = conv32(sbi->native, ino->i_mtime);
 
         for (i = 0; i < V1_NR_DIRECT_ZONES; ++i)
-                ino->i_dzone[i] = conv16(sbi->native, ino->i_dzone[i]);
+                ino_i->i_dzone[i] = conv16(sbi->native, ino->i_dzone[i]);
 
         for (i = 0; i < V1_NR_INDIRECT_ZONES; ++i)
-                ino->i_izone[i] = conv16(sbi->native, ino->i_izone[i]);
+                ino_i->i_izone[i] = conv16(sbi->native, ino->i_izone[i]);
 
         block_put(b);
 
-        return ino;
+        free(ino);
+        return ino_i;
+
+out_err:
+        if (ino)
+                free(ino);
+        if (ino_i)
+                free(ino_i);
+        return NULL;
 }
 
-struct mfs2_inode *mfs2_read_inode_raw(const struct mfs_instance *instance,
+struct mfs_ino_info *mfs2_read_inode_raw(const struct mfs_instance *instance,
                                         uint32_t inum)
 {
-        struct mfs2_inode *ino;
+        struct mfs2_inode *ino = NULL;
+        struct mfs_ino_info *ino_i = NULL;
         struct mfs_sb_info *sbi;
         block_t *b;
@@ -58 +71 @@
 
         ino = (struct mfs2_inode *) malloc(ino_size);
+        ino_i = (struct mfs_ino_info *) malloc(sizeof(struct mfs_ino_info));
 
-        if (!ino)
-                return NULL;
+        if (!ino || !ino_i)
+                goto out_err;
 
         sbi = instance->sbi;
@@ -68 +82 @@
         const int ino_off = inum % V3_INODES_PER_BLOCK(sbi->block_size);
 
-        block_get(&b, instance->handle, 
+        if (block_get(&b, instance->handle, 
                 itable_off + inum / V3_INODES_PER_BLOCK(sbi->block_size),
-                BLOCK_FLAGS_NONE);
+                        BLOCK_FLAGS_NONE) != EOK)
+                goto out_err;
 
         memcpy(ino, ((uint8_t *)b->data) + ino_off * ino_size, ino_size);
 
-        ino->i_mode = conv16(sbi->native, ino->i_mode);
-        ino->i_nlinks = conv16(sbi->native, ino->i_nlinks);
-        ino->i_uid = conv16(sbi->native, ino->i_uid);
-        ino->i_gid = conv16(sbi->native, ino->i_gid);
-        ino->i_size = conv32(sbi->native, ino->i_size);
-        ino->i_atime = conv32(sbi->native, ino->i_atime);
-        ino->i_mtime = conv32(sbi->native, ino->i_mtime);
-        ino->i_ctime = conv32(sbi->native, ino->i_ctime);
+        ino_i->i_mode = conv16(sbi->native, ino->i_mode);
+        ino_i->i_nlinks = conv16(sbi->native, ino->i_nlinks);
+        ino_i->i_uid = conv16(sbi->native, ino->i_uid);
+        ino_i->i_gid = conv16(sbi->native, ino->i_gid);
+        ino_i->i_size = conv32(sbi->native, ino->i_size);
+        ino_i->i_atime = conv32(sbi->native, ino->i_atime);
+        ino_i->i_mtime = conv32(sbi->native, ino->i_mtime);
+        ino_i->i_ctime = conv32(sbi->native, ino->i_ctime);
 
         for (i = 0; i < V2_NR_DIRECT_ZONES; ++i)
-                ino->i_dzone[i] = conv32(sbi->native, ino->i_dzone[i]);
+                ino_i->i_dzone[i] = conv32(sbi->native, ino->i_dzone[i]);
 
         for (i = 0; i < V2_NR_INDIRECT_ZONES; ++i)
-                ino->i_izone[i] = conv32(sbi->native, ino->i_izone[i]);
+                ino_i->i_izone[i] = conv32(sbi->native, ino->i_izone[i]);
 
         block_put(b);
 
-        return ino;
+        free(ino);
+        return ino_i;
+
+out_err:
+        if (ino)
+                free(ino);
+        if (ino_i)
+                free(ino_i);
+        return NULL;
 }