Changeset 88ccd8b8 in mainline

Timestamp:

2011-04-07T21:02:47Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

969d88e

Parents:

7a57269f

Message:

Some improvements to write support:

• mfs_create_node() function implemented
• Link the mfs_link() function to the libfs_ops structure (not finished yet).

File:

• uspace/srv/fs/minixfs/mfs_ops.c (modified) (4 diffs)

uspace/srv/fs/minixfs/mfs_ops.c

@@ -57 +57 @@
 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 int mfs_link(fs_node_t *pfn, fs_node_t *cfn, const char *name);
 
 static
@@ -78 +79 @@
         .match = mfs_match,
         .create = mfs_create_node,
+        .link = mfs_link,
         .plb_get_char = mfs_plb_get_char,
         .has_children = mfs_has_children,
@@ -252 +254 @@
 static int mfs_create_node(fs_node_t **rfn, devmap_handle_t handle, int flags)
 {
+        int r;
+        struct mfs_instance *inst;
+        struct mfs_node *mnode;
+        fs_node_t *fsnode;
+        uint32_t inum;
+        
         mfsdebug("create_node()\n");
-        return ENOTSUP;
+
+        r = mfs_instance_get(handle, &inst);
+        if (r != EOK)
+                return r;
+
+        if (flags & L_DIRECTORY) {
+                /*Not yet supported*/
+                return ENOTSUP;
+        }
+
+        /*Alloc a new inode*/
+        r = mfs_alloc_bit(inst, &inum, BMAP_INODE);
+        if (r != EOK)
+                return r;
+
+        struct mfs_ino_info *ino_i;
+
+        ino_i = malloc(sizeof(*ino_i));
+        if (!ino_i) {
+                r = ENOMEM;
+                goto out_err;
+        }
+
+        mnode = malloc(sizeof(*mnode));
+        if (!mnode) {
+                r = ENOMEM;
+                goto out_err_1;
+        }
+        
+        fsnode = malloc(sizeof(fs_node_t));
+        if (!fsnode) {
+                r = ENOMEM;
+                goto out_err_2;
+        }
+
+        ino_i->i_mode = S_IFREG;
+        ino_i->i_nlinks = 1;
+        ino_i->i_uid = 0;
+        ino_i->i_gid = 0;
+        ino_i->i_size = 0;
+        ino_i->i_atime = 0;
+        ino_i->i_mtime = 0;
+        ino_i->i_ctime = 0;
+
+        memset(ino_i->i_dzone, 0, sizeof(uint32_t) * V2_NR_DIRECT_ZONES);
+        memset(ino_i->i_izone, 0, sizeof(uint32_t) * V2_NR_INDIRECT_ZONES);
+
+        ino_i->index = inum;
+        ino_i->dirty = true;
+        mnode->ino_i = ino_i;
+        mnode->instance = inst;
+
+        put_inode(mnode);
+
+        fs_node_initialize(fsnode);
+        fsnode->data = mnode;
+        *rfn = fsnode;
+
+        return EOK;
+
+out_err_2:
+        free(mnode);
+out_err_1:
+        free(ino_i);
+out_err:
+        return r;
 }
 
@@ -454 +527 @@
 {
         return mfs_reg.plb_ro[pos % PLB_SIZE];
+}
+
+static int mfs_link(fs_node_t *pfn, fs_node_t *cfn, const char *name)
+{
+        mfsdebug("mfs_link()\n");
+        return ENOTSUP;
 }