Changeset 87d4422 in mainline

Timestamp:

2011-04-03T13:44:18Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

c4eeb2f

Parents:

ae8541d

Message:

Add "write_dentry()" function to write directory entries to disk

Location:

uspace/srv/fs/minixfs

Files:

• mfs.h (modified) (2 diffs)
• mfs_dentry.c (modified) (2 diffs)

uspace/srv/fs/minixfs/mfs.h

@@ -126 +126 @@
         /*The following fields do not exist on disk but only in memory*/
         bool dirty;
+        unsigned index;
+        /*Pointer to the node at witch the dentry belongs*/
+        struct mfs_node *node;
 };
 
@@ -166 +169 @@
 read_directory_entry(struct mfs_node *mnode, unsigned index);
 
+extern int
+write_dentry(struct mfs_dentry_info *d_info);
+
 /*mfs_balloc.c*/
 extern int

uspace/srv/fs/minixfs/mfs_dentry.c

@@ -80 +80 @@
 
         d_info->dirty = false;
+        d_info->index = index;
+        d_info->node = mnode;
         return d_info;
 
@@ -87 +89 @@
 }
 
+int
+write_dentry(struct mfs_dentry_info *d_info)
+{
+        struct mfs_node *mnode = d_info->node;
+        struct mfs_sb_info *sbi = mnode->instance->sbi;
+        const unsigned d_off_bytes = d_info->index * sbi->dirsize;
+        const unsigned dirs_per_block = sbi->block_size / sbi->dirsize;
+        block_t *b;
+        uint32_t block;
+        int r;
+
+        r = read_map(&block, mnode, d_off_bytes);
+        if (r != EOK)
+                goto out;
+
+        r = block_get(&b, mnode->instance->handle, block, BLOCK_FLAGS_NONE);
+        if (r != EOK)
+                goto out;
+
+        const size_t name_len = str_size(d_info->d_name);
+        uint8_t *ptr = b->data;
+        ptr += (d_info->index % dirs_per_block) * sbi->dirsize;
+
+        if (sbi->fs_version == MFS_VERSION_V3) {
+                struct mfs3_dentry *dentry;
+                dentry = (struct mfs3_dentry *) ptr;
+
+                dentry->d_inum = conv32(sbi->native, d_info->d_inum);
+                memcpy(dentry->d_name, d_info->d_name, name_len);
+        } else {
+                struct mfs_dentry *dentry;
+                dentry = (struct mfs_dentry *) ptr;
+
+                dentry->d_inum = conv16(sbi->native, d_info->d_inum);
+                memcpy(dentry->d_name, d_info->d_name, name_len);
+        }
+
+        b->dirty = true;
+        block_put(b);
+
+out:
+        return r;
+}
+
 /**
  * @}