Changeset 1196df6 in mainline for uspace/srv/fs/ext4fs

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:

6f413125

Parents:

3b5c119

Message:

extents: hotfix with writing to an existing empty file

File:

• uspace/srv/fs/ext4fs/ext4fs_ops.c (modified) (1 diff)

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;
         }