Changeset 2f591127 in mainline for uspace/lib/ext4/libext4_balloc.c

Timestamp:

2014-01-19T14:35:04Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

5828554

Parents:

a159c6a

Message:

ext4: fix some minor bugs and memory leaks

File:

• uspace/lib/ext4/libext4_balloc.c (modified) (5 diffs)

uspace/lib/ext4/libext4_balloc.c

@@ -91 +91 @@
         block_t *bitmap_block;
         rc = block_get(&bitmap_block, fs->device, bitmap_block_addr, 0);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                ext4_filesystem_put_block_group_ref(bg_ref);
+                return rc;
+        }
         
         /* Modify bitmap */
@@ -513 +515 @@
                         bitmap_block->dirty = true;
                         rc = block_put(bitmap_block);
-                        if (rc != EOK)
+                        if (rc != EOK) {
+                                ext4_filesystem_put_block_group_ref(bg_ref);
                                 return rc;
+                        }
                         
                         allocated_block =
@@ -529 +533 @@
                         bitmap_block->dirty = true;
                         rc = block_put(bitmap_block);
-                        if (rc != EOK)
+                        if (rc != EOK) {
+                                ext4_filesystem_put_block_group_ref(bg_ref);
                                 return rc;
+                        }
                         
                         allocated_block =
@@ -600 +606 @@
     bool *free)
 {
-        int rc = EOK;
+        int rc;
         
         ext4_filesystem_t *fs = inode_ref->fs;
@@ -621 +627 @@
         block_t *bitmap_block;
         rc = block_get(&bitmap_block, fs->device, bitmap_block_addr, 0);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                ext4_filesystem_put_block_group_ref(bg_ref);
+                return rc;
+        }
         
         /* Check if block is free */