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

Timestamp:

2011-11-10T19:59:51Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

27ca3a3

Parents:

b3d7277

Message:

bugfixes in indirect block writing

File:

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

uspace/lib/ext4/libext4_filesystem.c

@@ -82 +82 @@
         fs->inode_blocks_per_level[0] = 1;
         for (i = 1; i < 4; i++) {
-                fs->inode_blocks_per_level[i]  = fs->inode_blocks_per_level[i-1] *
+                fs->inode_blocks_per_level[i] = fs->inode_blocks_per_level[i-1] *
                     block_ids_per_block;
                 fs->inode_block_limits[i] = fs->inode_block_limits[i-1] +
@@ -321 +321 @@
         offset_in_block = block_offset_in_level / fs->inode_blocks_per_level[level-1];
 
+        if (current_block == 0) {
+                *fblock = 0;
+                return EOK;
+        }
+
         /* Navigate through other levels, until we find the block number
          * or find null reference meaning we are dealing with sparse file
@@ -415 +420 @@
                 if (rc != EOK) {
                         // TODO error
-                }
-                EXT4FS_DBG("AAA: new addr \%u, level = \%u", new_block_addr, level);
+                        EXT4FS_DBG("error in allocation");
+                }
+//              EXT4FS_DBG("AAA: new addr \%u, level = \%u", new_block_addr, level);
 
                 ext4_inode_set_indirect_block(inode_ref->inode, level - 1, new_block_addr);
@@ -435 +441 @@
                         EXT4FS_DBG("block put error");
                 }
+
+//              EXT4FS_DBG("allocated indirect block for level \%u, during setting iblock \%u", level, (uint32_t)iblock);
 
                 current_block = new_block_addr;
@@ -462 +470 @@
                                 if (rc != EOK) {
                                         // TODO error
+
+                                        EXT4FS_DBG("BBB: error block loading");
+
                                 }
                                 memset(new_block->data, 0, block_size);
@@ -524 +535 @@
 
                 ext4_inode_set_direct_block(inode, iblock, 0);
-                return ext4_bitmap_free_block(fs, fblock);
+                return ext4_bitmap_free_block(fs, inode_ref, fblock);
         }
 
@@ -588 +599 @@
         }
 
-        return ext4_bitmap_free_block(fs, fblock);
+        return ext4_bitmap_free_block(fs, inode_ref, fblock);
 
 }