Changeset 2f591127 in mainline

Timestamp:

2014-01-19T14:35:04Z (11 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

Location:

uspace

Files:

• lib/ext4/libext4_balloc.c (modified) (5 diffs)
• lib/ext4/libext4_ialloc.c (modified) (3 diffs)
• srv/fs/ext4fs/ext4fs_ops.c (modified) (1 diff)

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 */

uspace/lib/ext4/libext4_ialloc.c

@@ -204 +204 @@
                         rc = block_get(&bitmap_block, fs->device, bitmap_block_addr,
                             BLOCK_FLAGS_NONE);
-                        if (rc != EOK)
+                        if (rc != EOK) {
+                                ext4_filesystem_put_block_group_ref(bg_ref);
                                 return rc;
+                        }
                         
                         /* Try to allocate i-node in the bitmap */
@@ -225 +227 @@
                                         return rc;
 
+                                bgid++;
                                 continue;
                         }
@@ -232 +235 @@
                         
                         rc = block_put(bitmap_block);
-                        if (rc != EOK)
+                        if (rc != EOK) {
+                                ext4_filesystem_put_block_group_ref(bg_ref);
                                 return rc;
+                        }
                         
                         /* Modify filesystem counters */

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -1403 +1403 @@
         }
         
-        if (flags == BLOCK_FLAGS_NOREAD)
+        if (flags == BLOCK_FLAGS_NOREAD) {
                 memset(write_block->data, 0, block_size);
+                write_block->dirty = true;
+        }
 
         rc = async_data_write_finalize(callid, write_block->data +
             (pos % block_size), bytes);
-        if (rc != EOK)
+        if (rc != EOK) {
+                block_put(write_block);
                 goto exit;
-
-        write_block->dirty = true;
-        
+        }
+
         rc = block_put(write_block);
         if (rc != EOK)