Changeset 6f41312 in mainline

Timestamp:

2012-04-08T09:09:57Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

95947d24

Parents:

1196df6

Message:

error handling TODOs done

File:

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

uspace/lib/ext4/libext4_extent.c

@@ -302 +302 @@
                 rc = block_get(&block, inode_ref->fs->device, fblock, BLOCK_FLAGS_NONE);
                 if (rc != EOK) {
-                        // TODO cleanup
-                        EXT4FS_DBG("ERRRR");
-                        return rc;
+                        goto cleanup;
                 }
 
@@ -325 +323 @@
 
         return EOK;
+
+cleanup:
+        // Put loaded blocks
+        // From 1 -> 0 is a block with inode data
+        for (uint16_t i = 1; i < tmp_path->depth; ++i) {
+                if (tmp_path[i].block) {
+                        block_put(tmp_path[i].block);
+                }
+        }
+
+        // Destroy temporary data structure
+        free(tmp_path);
+
+        return rc;
+
 }
 
@@ -400 +413 @@
                 uint32_t iblock_from)
 {
-        int rc;
+        int rc = EOK;
 
         // Find the first extent to modify
@@ -429 +442 @@
         rc = ext4_balloc_free_blocks(inode_ref, first_fblock, delete_count);
         if (rc != EOK) {
-                // TODO goto cleanup
-                EXT4FS_DBG("ERROR");
-                return rc;
+                goto cleanup;
         }
 
@@ -454 +465 @@
                 rc = ext4_balloc_free_blocks(inode_ref, first_fblock, delete_count);
                 if (rc != EOK) {
-                        // TODO goto cleanup
-                        EXT4FS_DBG("ERROR");
-                        return rc;
+                        goto cleanup;
                 }
 
@@ -472 +481 @@
                 rc = ext4_balloc_free_block(inode_ref, path_ptr->block->lba);
                 if (rc != EOK) {
-                        EXT4FS_DBG("ERROR");
-                        // TODO goto cleanup
-                        return rc;
+                        goto cleanup;
                 }
                 check_tree = true;
@@ -497 +504 @@
                         rc = ext4_extent_release_branch(inode_ref, index);
                         if (rc != EOK) {
-                                EXT4FS_DBG("ERR");
-                                // TODO goto cleanup
-                                return rc;
+                                goto cleanup;
                         }
                         ++index;
@@ -511 +516 @@
                         rc = ext4_balloc_free_block(inode_ref, path_ptr->block->lba);
                         if (rc != EOK) {
-                                EXT4FS_DBG("ERROR");
-                                // TODO goto cleanup
-                                return rc;
+                                goto cleanup;
                         }
                         check_tree = true;
@@ -524 +527 @@
 
 
-        // Finish
-        uint16_t depth = path->depth;
-
+cleanup:
         // Put loaded blocks
         // From 1 -> 0 is a block with inode data
-        for (uint16_t i = 1; i < depth; ++i) {
+        for (uint16_t i = 1; i < path->depth; ++i) {
                 if (path[i].block) {
                         block_put(path[i].block);
@@ -538 +539 @@
         free(path);
 
-        return EOK;
+        return rc;
 }
 
@@ -544 +545 @@
                 uint32_t *iblock, uint32_t *fblock)
 {
-        int rc;
+        int rc = EOK;
 
         ext4_superblock_t *sb = inode_ref->fs->superblock;
@@ -569 +570 @@
         rc = ext4_extent_find_extent(inode_ref, new_block_idx, &path);
         if (rc != EOK) {
-                EXT4FS_DBG("find extent ERROR");
                 return rc;
         }
@@ -590 +590 @@
                 rc = ext4_balloc_alloc_block(inode_ref, &phys_block);
                 if (rc != EOK) {
-                        EXT4FS_DBG("ERRO in balloc");
-                        return rc;
+                        goto finish;
                 }
 
@@ -626 +625 @@
         free(path);
 
-        return EOK;
+        return rc;
 }