Changeset 1196df6 in mainline

Timestamp:

2012-04-08T09:02:16Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

6f41312

Parents:

3b5c119

Message:

extents: hotfix with writing to an existing empty file

Location:

uspace

Files:

• lib/ext4/libext4_extent.c (modified) (4 diffs)
• lib/ext4/libext4_filesystem.c (modified) (1 diff)
• srv/fs/ext4fs/ext4fs_ops.c (modified) (1 diff)

uspace/lib/ext4/libext4_extent.c

@@ -249 +249 @@
         ext4_extent_binsearch(header, &extent, iblock);
 
-        assert(extent != NULL);
-
-        uint32_t phys_block;
-        phys_block = ext4_extent_get_start(extent) + iblock;
-        phys_block -= ext4_extent_get_first_block(extent);
-
-        *fblock = phys_block;
+        if (extent == NULL) {
+                *fblock = 0;
+        } else {
+                uint32_t phys_block;
+                phys_block = ext4_extent_get_start(extent) + iblock;
+                phys_block -= ext4_extent_get_first_block(extent);
+
+                *fblock = phys_block;
+        }
 
         if (block != NULL) {
                 block_put(block);
         }
-
 
         return EOK;
@@ -396 +397 @@
 }
 
-int ext4_extent_release_blocks_from(ext4_inode_ref_t *inode_ref, uint32_t iblock_from)
+int ext4_extent_release_blocks_from(ext4_inode_ref_t *inode_ref,
+                uint32_t iblock_from)
 {
         int rc;
@@ -600 +602 @@
 
         } else {
-                // try allocate succeeding extent block
+                // try allocate scceeding extent block
 
                 // TODO
@@ -609 +611 @@
 
 finish:
+
+        *iblock = new_block_idx;
+        *fblock = phys_block;
+
         // Put loaded blocks
         // From 1 -> 0 is a block with inode data

uspace/lib/ext4/libext4_filesystem.c

@@ -541 +541 @@
                                 ext4_inode_has_flag(inode_ref->inode, EXT4_INODE_FLAG_EXTENTS)) {
 
-                rc = ext4_extent_release_blocks_from(inode_ref, old_blocks_count - diff_blocks_count);
+                rc = ext4_extent_release_blocks_from(inode_ref,
+                                old_blocks_count - diff_blocks_count);
                 if (rc != EOK) {
                         return rc;

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -1097 +1097 @@
 
         if (fblock == 0) {
-                rc =  ext4_balloc_alloc_block(inode_ref, &fblock);
-                if (rc != EOK) {
-                        ext4fs_node_put(fn);
-                        async_answer_0(callid, rc);
-                        return rc;
-                }
-
-                rc = ext4_filesystem_set_inode_data_block_index(inode_ref, iblock, fblock);
-                if (rc != EOK) {
-                        ext4_balloc_free_block(inode_ref, fblock);
-                        ext4fs_node_put(fn);
-                        async_answer_0(callid, rc);
-                        return rc;
-                }
+
+                if (ext4_superblock_has_feature_incompatible(
+                                fs->superblock, EXT4_FEATURE_INCOMPAT_EXTENTS) &&
+                                (ext4_inode_has_flag(inode_ref->inode, EXT4_INODE_FLAG_EXTENTS))) {
+
+                        uint32_t tmp_iblock = 0;
+                        do {
+                                rc = ext4_filesystem_append_inode_block(inode_ref, &fblock, &tmp_iblock);
+                                if (rc != EOK) {
+                                        ext4fs_node_put(fn);
+                                        async_answer_0(callid, rc);
+                                        return rc;
+                                }
+                        } while (tmp_iblock < iblock);
+
+                } else {
+                        rc =  ext4_balloc_alloc_block(inode_ref, &fblock);
+                        if (rc != EOK) {
+                                ext4fs_node_put(fn);
+                                async_answer_0(callid, rc);
+                                return rc;
+                        }
+
+                        rc = ext4_filesystem_set_inode_data_block_index(inode_ref, iblock, fblock);
+                        if (rc != EOK) {
+                                ext4_balloc_free_block(inode_ref, fblock);
+                                ext4fs_node_put(fn);
+                                async_answer_0(callid, rc);
+                                return rc;
+                        }
+                }
+
+                flags = BLOCK_FLAGS_NOREAD;
                 inode_ref->dirty = true;
-
-                flags = BLOCK_FLAGS_NOREAD;
         }