Changeset 1196df6 in mainline for uspace/lib/ext4/libext4_extent.c

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

File:

• uspace/lib/ext4/libext4_extent.c (modified) (4 diffs)

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