Changeset 10eb754 in mainline

Timestamp:

2011-04-02T09:14:57Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

f3e2663

Parents:

9cd199c

Message:

Add mfs_write_inode_raw() function to write V1 dirty inodes on disk.

Location:

uspace/srv/fs/minixfs

Files:

• mfs.h (modified) (2 diffs)
• mfs_inode.c (modified) (6 diffs)
• mfs_ops.c (modified) (6 diffs)

uspace/srv/fs/minixfs/mfs.h

@@ -91 +91 @@
         int ino_per_block;
         int dirsize;
+        int itable_off;
         unsigned max_name_len;
         bool long_names;
@@ -155 +156 @@
 mfs2_read_inode_raw(const struct mfs_instance *instance, uint32_t inum);
 
+extern int
+put_inode(struct mfs_node *mnode);
+
 /*mfs_read.c*/
 int read_map(uint32_t *b, const struct mfs_node *mnode, const uint32_t pos);

uspace/srv/fs/minixfs/mfs_inode.c

@@ -38 +38 @@
 #include "mfs_utils.h"
 
-struct mfs_ino_info *mfs_read_inode_raw(const struct mfs_instance *instance, 
-                                        uint16_t inum)
+static int
+mfs_write_inode_raw(struct mfs_node *mnode);
+
+struct mfs_ino_info *
+mfs_read_inode_raw(const struct mfs_instance *instance, uint16_t inum)
 {
         struct mfs_inode *ino = NULL;
@@ -46 +49 @@
         block_t *b;
         int i;
+
+        sbi = instance->sbi;
+        assert(sbi);
         
-        const int ino_off = inum % V1_INODES_PER_BLOCK;
+        const int ino_off = inum % sbi->ino_per_block;
         const size_t ino_size = sizeof(struct mfs_inode);
 
@@ -56 +62 @@
                 goto out_err;
 
-        sbi = instance->sbi;
-        assert(sbi);
-
-        const int itable_off = 2 + sbi->ibmap_blocks + sbi->zbmap_blocks;
+        const int itable_off = sbi->itable_off;
 
         if (block_get(&b, instance->handle,
-                        itable_off + inum / V1_INODES_PER_BLOCK,
+                        itable_off + inum / sbi->ino_per_block,
                         BLOCK_FLAGS_NONE) != EOK)
                 goto out_err;
@@ -94 +97 @@
 }
 
-struct mfs_ino_info *mfs2_read_inode_raw(const struct mfs_instance *instance,
-                                        uint32_t inum)
+struct mfs_ino_info *
+mfs2_read_inode_raw(const struct mfs_instance *instance, uint32_t inum)
 {
         struct mfs2_inode *ino = NULL;
@@ -114 +117 @@
         assert(sbi);
 
-        const int itable_off = 2 + sbi->ibmap_blocks + sbi->zbmap_blocks;
-        const int ino_off = inum % V3_INODES_PER_BLOCK(sbi->block_size);
+        const int itable_off = sbi->itable_off;
+        const int ino_off = inum % sbi->ino_per_block;
 
         if (block_get(&b, instance->handle, 
-                itable_off + inum / V3_INODES_PER_BLOCK(sbi->block_size),
+                itable_off + inum / sbi->ino_per_block,
                         BLOCK_FLAGS_NONE) != EOK)
                 goto out_err;
@@ -153 +156 @@
 }
 
+int
+put_inode(struct mfs_node *mnode)
+{
+        int rc = EOK;
+
+        assert(mnode);
+        assert(mnode->ino_i);
+
+        if (!mnode->ino_i->dirty)
+                goto out;
+
+        struct mfs_instance *inst = mnode->instance;
+        assert(inst);
+        struct mfs_sb_info *sbi = inst->sbi;
+        assert(sbi);
+
+        if (sbi->fs_version == MFS_VERSION_V1)
+                rc = mfs_write_inode_raw(mnode);
+        else {
+                /*rc = mfs2_write_inode_raw(mnode);*/
+        }
+
+out:
+        return rc;
+}
+
+static int
+mfs_write_inode_raw(struct mfs_node *mnode)
+{
+        int i, r;
+        block_t *b;
+        struct mfs_ino_info *ino_i = mnode->ino_i;
+        struct mfs_sb_info *sbi = mnode->instance->sbi;
+
+        const int itable_off = sbi->itable_off;
+        const int ino_off = ino_i->index % sbi->ino_per_block;
+        const bool native = sbi->native;
+
+        r = block_get(&b, mnode->instance->handle,
+                                itable_off + ino_i->index / sbi->ino_per_block,
+                                BLOCK_FLAGS_NONE);
+
+        if (r != EOK)
+                goto out;
+
+        struct mfs_inode *ino = b->data;
+        ino += ino_off;
+
+        ino->i_mode = conv16(native, ino_i->i_mode);
+        ino->i_uid = conv16(native, ino_i->i_uid);
+        ino->i_gid = ino_i->i_gid;
+        ino->i_nlinks = ino_i->i_nlinks;
+        ino->i_size = conv32(native, ino_i->i_size);
+        ino->i_mtime = conv32(native, ino_i->i_mtime);
+
+        for (i = 0; i < V1_NR_DIRECT_ZONES; ++i)
+                ino->i_dzone[i] = conv16(native, ino_i->i_dzone[i]);
+        for (i = 0; i < V1_NR_INDIRECT_ZONES; ++i)
+                ino->i_izone[i] = conv16(native, ino_i->i_izone[i]);
+
+        b->dirty = true;
+        block_put(b);
+
+        ino_i->dirty = false;
+out:
+        return r;
+}
+
 /**
  * @}

uspace/srv/fs/minixfs/mfs_ops.c

@@ -56 +56 @@
 static aoff64_t mfs_size_get(fs_node_t *node);
 static int mfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component);
+static int mfs_create_node(fs_node_t **rfn, devmap_handle_t handle, int flags);
 
 static
@@ -76 +77 @@
         .index_get = mfs_index_get,
         .match = mfs_match,
+        .create = mfs_create_node,
         .plb_get_char = mfs_plb_get_char,
         .has_children = mfs_has_children,
@@ -191 +193 @@
                 sbi->nzones = conv32(native, sb3->s_nzones);
                 sbi->block_size = conv16(native, sb3->s_block_size);
+                sbi->ino_per_block = V3_INODES_PER_BLOCK(sbi->block_size);
                 sbi->dirsize = MFS3_DIRSIZE;
                 sbi->max_name_len = MFS3_MAX_NAME_LEN;
@@ -202 +205 @@
                 sbi->nzones = conv16(native, sb->s_nzones);
                 sbi->block_size = MFS_BLOCKSIZE;
+                sbi->ino_per_block = V1_INODES_PER_BLOCK;
                 if (version == MFS_VERSION_V2)
                         sbi->nzones = conv32(native, sb->s_nzones2);
@@ -208 +212 @@
                                 MFS_MAX_NAME_LEN;
         }
+        sbi->itable_off = 2 + sbi->ibmap_blocks + sbi->zbmap_blocks;
  
         free(sb);
@@ -243 +248 @@
         struct mfs_node *node = fsnode->data;
         return node->instance->handle;
+}
+
+static int mfs_create_node(fs_node_t **rfn, devmap_handle_t handle, int flags)
+{
+        mfsdebug("create_node()\n");
+        return ENOTSUP;
 }