Changeset 304faab in mainline for uspace/lib/ext4/libext4_filesystem.c

Timestamp:

2012-01-24T09:24:14Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

786bd56

Parents:

08cc26b

Message:

Very simple allocation algorithm

File:

• uspace/lib/ext4/libext4_filesystem.c (modified) (3 diffs)

uspace/lib/ext4/libext4_filesystem.c

@@ -266 +266 @@
 }
 
-int ext4_filesystem_alloc_inode(ext4_filesystem_t *fs, ext4_inode_ref_t **inode_ref)
-{
-        // TODO
-        return EOK;
-}
-
-int ext4_filesystem_init_inode(ext4_filesystem_t *fs, ext4_inode_ref_t *inode_ref, int flags)
-{
-        ext4_inode_t *inode = inode_ref->inode;
-
+int ext4_filesystem_alloc_inode(ext4_filesystem_t *fs,
+                ext4_inode_ref_t **inode_ref, int flags)
+{
+        int rc;
+
+        bool is_dir = false;
         if (flags & L_DIRECTORY) {
+                is_dir = true;
+        }
+
+        // allocate inode
+        uint32_t index;
+        rc = ext4_ialloc_alloc_inode(fs, &index, is_dir);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        // TODO extents, dir_index etc...
+        rc = ext4_filesystem_get_inode_ref(fs, index, inode_ref);
+        if (rc != EOK) {
+                ext4_ialloc_free_inode(fs, index, is_dir);
+                return rc;
+        }
+
+        // init inode
+        ext4_inode_t *inode = (*inode_ref)->inode;
+
+        if (is_dir) {
                 ext4_inode_set_mode(fs->superblock, inode, EXT4_INODE_MODE_DIRECTORY);
                 ext4_inode_set_links_count(inode, 1); // '.' entry
@@ -299 +316 @@
         }
 
+        (*inode_ref)->dirty = true;
+
         return EOK;
 }
@@ -408 +427 @@
 
         // Free inode
-        rc = ext4_ialloc_free_inode(fs, inode_ref);
+        if (ext4_inode_is_type(fs->superblock, inode_ref->inode,
+                        EXT4_INODE_MODE_DIRECTORY)) {
+                rc = ext4_ialloc_free_inode(fs, inode_ref->index, true);
+        } else {
+                rc = ext4_ialloc_free_inode(fs, inode_ref->index, false);
+        }
         if (rc != EOK) {
                 return rc;