Changeset ce6de59 in mainline for uspace/lib/ext4/libext4_filesystem.c

Timestamp:

2012-04-07T14:41:19Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

3b5c119

Parents:

5b16912

Message:

First part → allocating first block to extent (not for extent with some blocks)

File:

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

uspace/lib/ext4/libext4_filesystem.c

@@ -323 +323 @@
         }
 
-        // TODO extents, dir_index etc...
+        // TODO dir_index initialization
 
         rc = ext4_filesystem_get_inode_ref(fs, index, inode_ref);
@@ -340 +340 @@
                 ext4_inode_set_mode(fs->superblock, inode, EXT4_INODE_MODE_FILE);
                 ext4_inode_set_links_count(inode, 0);
+        }
+
+        if (ext4_superblock_has_feature_incompatible(
+                        fs->superblock, EXT4_FEATURE_INCOMPAT_EXTENTS)) {
+                ext4_inode_set_flag(inode, EXT4_INODE_FLAG_EXTENTS);
         }
 
@@ -666 +671 @@
         if (ext4_superblock_has_feature_compatible(fs->superblock, EXT4_FEATURE_INCOMPAT_EXTENTS) &&
                         ext4_inode_has_flag(inode_ref->inode, EXT4_INODE_FLAG_EXTENTS)) {
-                // TODO
+                // not reachable !!!
                 return ENOTSUP;
         }
@@ -802 +807 @@
         ext4_filesystem_t *fs = inode_ref->fs;
 
-        // EXTENTS are handled
+        // EXTENTS are handled otherwise
         assert(! (ext4_superblock_has_feature_incompatible(fs->superblock,
                         EXT4_FEATURE_INCOMPAT_EXTENTS) &&
@@ -890 +895 @@
                 uint32_t *fblock, uint32_t *iblock)
 {
-
-        // TODO append to extent
-
-        int rc;
+        int rc;
+
+        // Handle extents separately
+        if (ext4_superblock_has_feature_incompatible(
+                        inode_ref->fs->superblock, EXT4_FEATURE_INCOMPAT_EXTENTS) &&
+                        ext4_inode_has_flag(inode_ref->inode, EXT4_INODE_FLAG_EXTENTS)) {
+
+                return ext4_extent_append_block(inode_ref, iblock, fblock);
+
+        }
 
         ext4_superblock_t *sb = inode_ref->fs->superblock;