Changeset e5a1ace3 in mainline

Timestamp:

2013-11-28T20:40:38Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1f63d9d

Parents:

532f53d

Message:

libext4: do not ignore error codes

Location:

uspace/lib/ext4

Files:

• libext4_balloc.c (modified) (4 diffs)
• libext4_directory_index.c (modified) (5 diffs)
• libext4_extent.c (modified) (1 diff)
• libext4_ialloc.c (modified) (2 diffs)

uspace/lib/ext4/libext4_balloc.c

@@ -328 +328 @@
         *goal = inode_table_first_block + inode_table_blocks;
         
-        ext4_filesystem_put_block_group_ref(bg_ref);
-        
-        return EOK;
+        return ext4_filesystem_put_block_group_ref(bg_ref);
 }
 
@@ -469 +467 @@
         
         /* No free block found yet */
-        block_put(bitmap_block);
-        ext4_filesystem_put_block_group_ref(bg_ref);
+        rc = block_put(bitmap_block);
+        if (rc != EOK) {
+                ext4_filesystem_put_block_group_ref(bg_ref);
+                return rc;
+        }
+
+        rc = ext4_filesystem_put_block_group_ref(bg_ref);
+        if (rc != EOK)
+                return rc;
         
         /* Try other block groups */
@@ -540 +545 @@
                 }
                 
-                block_put(bitmap_block);
+                rc = block_put(bitmap_block);
+                if (rc != EOK) {
+                        ext4_filesystem_put_block_group_ref(bg_ref);
+                        return rc;
+                }
+
                 ext4_filesystem_put_block_group_ref(bg_ref);
+                if (rc != EOK)
+                        return rc;
                 
                 /* Goto next group */
@@ -576 +588 @@
         bg_ref->dirty = true;
         
-        ext4_filesystem_put_block_group_ref(bg_ref);
+        rc = ext4_filesystem_put_block_group_ref(bg_ref);
         
         *fblock = allocated_block;
-        return EOK;
+        return rc;
 }
 

uspace/lib/ext4/libext4_directory_index.c

@@ -527 +527 @@
                 
                 /* Don't forget to put old block (prevent memory leak) */
-                block_put(p->block);
+                rc = block_put(p->block);
+                if (rc != EOK)
+                        return rc;
                 
                 p->block = block;
@@ -553 +555 @@
         /* Load direct block 0 (index root) */
         uint32_t root_block_addr;
+        int rc2;
         int rc = ext4_filesystem_get_inode_data_block_index(inode_ref, 0,
             &root_block_addr);
@@ -620 +623 @@
                 
                 /* Not found, leave untouched */
-                block_put(leaf_block);
+                rc2 = block_put(leaf_block);
+                if (rc2 != EOK)
+                        goto cleanup;
                 
                 if (rc != ENOENT)
@@ -628 +633 @@
                 rc = ext4_directory_dx_next_block(inode_ref, hinfo.hash,
                     dx_block, &dx_blocks[0]);
-                if (rc < 0)
+                if (rc != EOK)
                         goto cleanup;
+
         } while (rc == ENOENT);
         
@@ -640 +646 @@
         
         while (tmp <= dx_block) {
-                block_put(tmp->block);
+                rc2 = block_put(tmp->block);
+                if (rc == EOK && rc2 != EOK)
+                        rc = rc2;
                 ++tmp;
         }

uspace/lib/ext4/libext4_extent.c

@@ -794 +794 @@
                         
                         /* Put back not modified old block */
-                        block_put(path_ptr->block);
+                        rc = block_put(path_ptr->block);
+                        if (rc != EOK) {
+                                ext4_balloc_free_block(inode_ref, fblock);
+                                return rc;
+                        }
                         
                         /* Initialize newly allocated block and remember it */

uspace/lib/ext4/libext4_ialloc.c

@@ -215 +215 @@
                         /* Block group has not any free i-node */
                         if (rc == ENOSPC) {
-                                block_put(bitmap_block);
-                                ext4_filesystem_put_block_group_ref(bg_ref);
+                                rc = block_put(bitmap_block);
+                                if (rc != EOK) {
+                                        ext4_filesystem_put_block_group_ref(bg_ref);
+                                        return rc;
+                                }
+
+                                rc = ext4_filesystem_put_block_group_ref(bg_ref);
+                                if (rc != EOK)
+                                        return rc;
+
                                 continue;
                         }
@@ -272 +280 @@
                 
                 /* Block group not modified, put it and jump to the next block group */
-                ext4_filesystem_put_block_group_ref(bg_ref);
+                rc = ext4_filesystem_put_block_group_ref(bg_ref);
+                if (rc != EOK)
+                        return rc;
+
                 ++bgid;
         }