Changeset d510ac01 in mainline

Timestamp:

2012-06-23T19:53:49Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

02020dc

Parents:

380553c

Message:

Fixed bug with different sizes in writing file on extents

Location:

uspace

Files:

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

uspace/lib/ext4/libext4_extent.c

@@ -742 +742 @@
                 uint32_t iblock)
 {
-        EXT4FS_DBG("iblock = \%u", iblock);
 
         int rc;
@@ -968 +967 @@
  */
 int ext4_extent_append_block(ext4_inode_ref_t *inode_ref,
-                uint32_t *iblock, uint32_t *fblock)
+                uint32_t *iblock, uint32_t *fblock, bool update_size)
 {
         int rc = EOK;
@@ -1026 +1025 @@
 
                         /* Update i-node */
-                        ext4_inode_set_size(inode_ref->inode, inode_size + block_size);
-                        inode_ref->dirty = true;
+                        if (update_size) {
+                                ext4_inode_set_size(inode_ref->inode, inode_size + block_size);
+                                inode_ref->dirty = true;
+                        }
 
                         path_ptr->block->dirty = true;
@@ -1056 +1057 @@
 
                         /* Update i-node */
-                        ext4_inode_set_size(inode_ref->inode, inode_size + block_size);
-                        inode_ref->dirty = true;
+                        if (update_size) {
+                                ext4_inode_set_size(inode_ref->inode, inode_size + block_size);
+                                inode_ref->dirty = true;
+                        }
 
                         path_ptr->block->dirty = true;
@@ -1067 +1070 @@
 /* Append new extent to the tree */
 append_extent:
-
-        /* Append extent for new block (includes tree splitting if needed) */
-        rc = ext4_extent_append_extent(inode_ref, path, &path_ptr, new_block_idx);
-        if (rc != EOK) {
-                goto finish;
-        }
 
         phys_block = 0;
@@ -1083 +1080 @@
         }
 
+        /* Append extent for new block (includes tree splitting if needed) */
+        rc = ext4_extent_append_extent(inode_ref, path, &path_ptr, new_block_idx);
+        if (rc != EOK) {
+                ext4_balloc_free_block(inode_ref, phys_block);
+                goto finish;
+        }
+
         /* Initialize newly created extent */
         ext4_extent_set_block_count(path_ptr->extent, 1);
@@ -1089 +1093 @@
 
         /* Update i-node */
-        ext4_inode_set_size(inode_ref->inode, inode_size + block_size);
-        inode_ref->dirty = true;
+        if (update_size) {
+                ext4_inode_set_size(inode_ref->inode, inode_size + block_size);
+                inode_ref->dirty = true;
+        }
 
         path_ptr->block->dirty = true;

uspace/lib/ext4/libext4_extent.h

@@ -64 +64 @@
 extern int ext4_extent_release_blocks_from(ext4_inode_ref_t *, uint32_t);
 
-extern int ext4_extent_append_block(ext4_inode_ref_t *, uint32_t *, uint32_t *);
+extern int ext4_extent_append_block(ext4_inode_ref_t *, uint32_t *, uint32_t *, bool);
 
 #endif

uspace/lib/ext4/libext4_filesystem.c

@@ -1119 +1119 @@
                         ext4_inode_has_flag(inode_ref->inode, EXT4_INODE_FLAG_EXTENTS)) {
 
-                return ext4_extent_append_block(inode_ref, iblock, fblock);
+                return ext4_extent_append_block(inode_ref, iblock, fblock, true);
 
         }

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -1344 +1344 @@
                                 (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);
+                        uint32_t last_iblock = ext4_inode_get_size(fs->superblock, inode_ref->inode) / block_size;
+                        while (last_iblock < iblock) {
+                                rc = ext4_extent_append_block(inode_ref, &last_iblock, &fblock, true);
                                 if (rc != EOK) {
                                         ext4fs_node_put(fn);
@@ -1352 +1352 @@
                                         return rc;
                                 }
-                        } while (tmp_iblock < iblock);
+                        }
+
+                        rc = ext4_extent_append_block(inode_ref, &last_iblock, &fblock, false);
+                        if (rc != EOK) {
+                                ext4fs_node_put(fn);
+                                async_answer_0(callid, rc);
+                                return rc;
+                        }
 
                 } else {