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

Timestamp:

2012-03-03T20:06:31Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

e8d054a

Parents:

7689590

Message:

Some TODOs solved (mostly in error handling)

File:

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

uspace/lib/ext4/libext4_filesystem.c

@@ -33 +33 @@
 /**
  * @file        libext4_filesystem.c
- * @brief       TODO
+ * @brief       More complex filesystem operations.
  */
 
@@ -348 +348 @@
                 rc = block_get(&block, fs->device, fblock, BLOCK_FLAGS_NONE);
                 if (rc != EOK) {
-                        // TODO error
+                        return rc;
                 }
 
@@ -358 +358 @@
                                 rc = ext4_balloc_free_block(fs, inode_ref, ind_block);
                                 if (rc != EOK) {
-                                        // TODO error
+                                        block_put(block);
+                                        return rc;
                                 }
                         }
@@ -366 +367 @@
                 rc = ext4_balloc_free_block(fs, inode_ref, fblock);
                 if (rc != EOK) {
-                        // TODO error
+                        return rc;
                 }
 
@@ -379 +380 @@
                 rc = block_get(&block, fs->device, fblock, BLOCK_FLAGS_NONE);
                 if (rc != EOK) {
-                        // TODO error
+                        return rc;
                 }
 
@@ -389 +390 @@
                                 rc = block_get(&subblock, fs->device, ind_block, BLOCK_FLAGS_NONE);
                                 if (rc != EOK) {
-                                        // TODO error
+                                        block_put(block);
+                                        return rc;
                                 }
 
@@ -399 +401 @@
                                                 rc = ext4_balloc_free_block(fs, inode_ref, ind_subblock);
                                                 if (rc != EOK) {
-                                                        // TODO error
+                                                        block_put(subblock);
+                                                        block_put(block);
+                                                        return rc;
                                                 }
                                         }
@@ -410 +414 @@
                         rc = ext4_balloc_free_block(fs, inode_ref, ind_block);
                         if (rc != EOK) {
-                                // TODO error
+                                block_put(block);
+                                return rc;
                         }
 
@@ -419 +424 @@
                 rc = ext4_balloc_free_block(fs, inode_ref, fblock);
                 if (rc != EOK) {
-                        // TODO error
+                        return rc;
                 }
 
@@ -613 +618 @@
         }
 
-
-
         uint32_t block_size = ext4_superblock_get_block_size(fs->superblock);
 
@@ -628 +631 @@
                 rc = ext4_balloc_alloc_block(fs, inode_ref, &new_block_addr);
                 if (rc != EOK) {
-                        // TODO error
-                        EXT4FS_DBG("error in allocation");
+                        return rc;
                 }
 
@@ -638 +640 @@
                 rc = block_get(&new_block, fs->device, new_block_addr, BLOCK_FLAGS_NOREAD);
                 if (rc != EOK) {
-                        EXT4FS_DBG("block load error");
-                        // TODO error
+                        ext4_balloc_free_block(fs, inode_ref, new_block_addr);
+                        return rc;
                 }
 
@@ -647 +649 @@
                 rc = block_put(new_block);
                 if (rc != EOK) {
-                        EXT4FS_DBG("block put error");
-                }
-
-//              EXT4FS_DBG("allocated indirect block for level \%u, during setting iblock \%u", level, (uint32_t)iblock);
+                        return rc;
+                }
 
                 current_block = new_block_addr;
@@ -670 +670 @@
                         rc = ext4_balloc_alloc_block(fs, inode_ref, &new_block_addr);
                         if (rc != EOK) {
-                                // TODO error
-                                EXT4FS_DBG("allocation error");
+                                block_put(block);
+                                return rc;
                         }
 
                         rc = block_get(&new_block, fs->device, new_block_addr, BLOCK_FLAGS_NOREAD);
                         if (rc != EOK) {
-                                // TODO error
-
-                                EXT4FS_DBG("BBB: error block loading");
-
+                                block_put(block);
+                                return rc;
                         }
+
                         memset(new_block->data, 0, block_size);
                         new_block->dirty = true;
@@ -686 +685 @@
                         rc = block_put(new_block);
                         if (rc != EOK) {
-                                EXT4FS_DBG("BBB: error indirect block saving");
+                                block_put(block);
+                                return rc;
                         }