Changeset 07dcec5 in mainline

Timestamp:

2011-04-07T19:48:48Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7a57269f

Parents:

04be5a0

Message:

Add insert_dentry() function to add a new directory entry to the parent dir.

Location:

uspace/srv/fs/minixfs

Files:

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

uspace/srv/fs/minixfs/mfs.h

@@ -90 +90 @@
         mfs_version_t fs_version;
         int ino_per_block;
-        int dirsize;
+        size_t dirsize;
         int itable_off;
         unsigned max_name_len;
@@ -122 +122 @@
 struct mfs_dentry_info {
         uint32_t d_inum;
-        char d_name[MFS3_MAX_NAME_LEN];
+        char d_name[MFS3_MAX_NAME_LEN + 1];
 
         /*The following fields do not exist on disk but only in memory*/
@@ -182 +182 @@
 write_dentry(struct mfs_dentry_info *d_info);
 
+int
+insert_dentry(struct mfs_node *mnode, char *d_name, fs_index_t d_inum);
+
 /*mfs_balloc.c*/
 extern int

uspace/srv/fs/minixfs/mfs_dentry.c

@@ -107 +107 @@
                 goto out;
 
-        const size_t name_len = str_size(d_info->d_name);
+        const size_t name_len = sbi->max_name_len;
         uint8_t *ptr = b->data;
         ptr += (d_info->index % dirs_per_block) * sbi->dirsize;
@@ -132 +132 @@
 }
 
+int
+insert_dentry(struct mfs_node *mnode, char *d_name, fs_index_t d_inum)
+{
+        int i, r;
+        struct mfs_sb_info *sbi = mnode->instance->sbi;
+        struct mfs_dentry_info *d_info;
+        bool empty_dentry_found = false;
+
+        const size_t name_len = str_size(d_name);
+
+        assert(name_len <= sbi->max_name_len);
+
+        /*Search for an empty dentry*/
+
+        for (i = 2; ; ++i) {
+                d_info = read_directory_entry(mnode, i);
+
+                if (!d_info) {
+                        /*Reached the end of the dentries list*/
+                        break;
+                }
+
+                if (d_info->d_inum == 0) {
+                        /*This entry is not used*/
+                        empty_dentry_found = true;
+                        break;
+                }
+                free(d_info);
+        }
+
+        if (!empty_dentry_found) {
+                r = inode_grow(mnode, sbi->dirsize);
+                if (r != EOK)
+                        return r;
+
+                d_info = read_directory_entry(mnode, i);
+                if (!d_info)
+                        return EIO;
+        }
+
+        d_info->d_inum = d_inum;
+        memcpy(d_info->d_name, d_name, name_len);
+        d_info->d_name[name_len] = 0;
+
+        return  write_dentry(d_info);
+}
+
+
 /**
  * @}