Changeset cf982ff in mainline for uspace/lib

Timestamp:

2014-01-28T21:08:38Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

0dd022ec

Parents:

476f62c (diff), 5828554 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge libext4 fixes

Location:

uspace/lib/ext4

Files:

• libext4_balloc.c (modified) (17 diffs)
• libext4_directory_index.c (modified) (5 diffs)
• libext4_extent.c (modified) (11 diffs)
• libext4_filesystem.c (modified) (3 diffs)
• libext4_ialloc.c (modified) (4 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 */
@@ -130 +132 @@
         
         /* Release block group reference */
-        rc = ext4_filesystem_put_block_group_ref(bg_ref);
-        if (rc != EOK)
-                return rc;
-        
-        return EOK;
+        return ext4_filesystem_put_block_group_ref(bg_ref);
 }
 
@@ -173 +171 @@
         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 */
@@ -212 +212 @@
         
         /* Release block group reference */
-        rc = ext4_filesystem_put_block_group_ref(bg_ref);
-        if (rc != EOK)
-                return rc;
-        
-        return EOK;
+        return ext4_filesystem_put_block_group_ref(bg_ref);
 }
 
@@ -264 +260 @@
  *
  */
-static uint32_t ext4_balloc_find_goal(ext4_inode_ref_t *inode_ref)
+static int ext4_balloc_find_goal(ext4_inode_ref_t *inode_ref, uint32_t *goal)
 {
-        uint32_t goal = 0;
-        
+        *goal = 0;
         ext4_superblock_t *sb = inode_ref->fs->superblock;
         
@@ -280 +275 @@
         if (inode_block_count > 0) {
                 int rc = ext4_filesystem_get_inode_data_block_index(inode_ref,
-                    inode_block_count - 1, &goal);
+                    inode_block_count - 1, goal);
                 if (rc != EOK)
-                        return 0;
+                        return rc;
                 
                 if (goal != 0) {
-                        goal++;
-                        return goal;
+                        (*goal)++;
+                        return EOK;
                 }
                 
@@ -302 +297 @@
             block_group, &bg_ref);
         if (rc != EOK)
-                return 0;
+                return rc;
         
         /* Compute indexes */
@@ -327 +322 @@
                 inode_table_blocks++;
         
-        goal = inode_table_first_block + inode_table_blocks;
-        
-        ext4_filesystem_put_block_group_ref(bg_ref);
-        
-        return goal;
+        *goal = inode_table_first_block + inode_table_blocks;
+        
+        return ext4_filesystem_put_block_group_ref(bg_ref);
 }
 
@@ -349 +342 @@
         block_t *bitmap_block;
         uint32_t rel_block_idx = 0;
+        uint32_t goal;
         
         /* Find GOAL */
-        uint32_t goal = ext4_balloc_find_goal(inode_ref);
-        if (goal == 0) {
+        int rc = ext4_balloc_find_goal(inode_ref, &goal);
+        if (rc != EOK)
+                return rc;
+        else if (goal == 0) {
                 /* no goal found => partition is full */
-                return ENOSPC;
+                return ENOMEM;
         }
         
@@ -366 +362 @@
         /* Load block group reference */
         ext4_block_group_ref_t *bg_ref;
-        int rc = ext4_filesystem_get_block_group_ref(inode_ref->fs,
+        rc = ext4_filesystem_get_block_group_ref(inode_ref->fs,
             block_group, &bg_ref);
         if (rc != EOK)
@@ -467 +463 @@
         
         /* 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 */
@@ -512 +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 =
@@ -528 +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 =
@@ -538 +545 @@
                 }
                 
-                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;
                 
                 /* Goto next group */
@@ -574 +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;
 }
 
@@ -592 +606 @@
     bool *free)
 {
-        int rc = EOK;
+        int rc;
         
         ext4_filesystem_t *fs = inode_ref->fs;
@@ -613 +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_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

@@ -371 +371 @@
     uint32_t *fblock)
 {
+        int rc;
         /* Compute bound defined by i-node size */
         uint64_t inode_size =
@@ -400 +401 @@
                 uint64_t child = ext4_extent_index_get_leaf(index);
                 
-                if (block != NULL)
-                        block_put(block);
-                
-                int rc = block_get(&block, inode_ref->fs->device, child,
+                if (block != NULL) {
+                        rc = block_put(block);
+                        if (rc != EOK)
+                                return rc;
+                }
+                
+                rc = block_get(&block, inode_ref->fs->device, child,
                     BLOCK_FLAGS_NONE);
                 if (rc != EOK)
@@ -429 +433 @@
         /* Cleanup */
         if (block != NULL)
-                block_put(block);
-        
-        return EOK;
+                rc = block_put(block);
+        
+        return rc;
 }
 
@@ -505 +509 @@
         
 cleanup:
+        ;
+
+        int rc2 = EOK;
+
         /*
          * Put loaded blocks
@@ -510 +518 @@
          */
         for (uint16_t i = 1; i < tmp_path->depth; ++i) {
-                if (tmp_path[i].block)
-                        block_put(tmp_path[i].block);
+                if (tmp_path[i].block) {
+                        rc2 = block_put(tmp_path[i].block);
+                        if (rc == EOK && rc2 != EOK)
+                                rc = rc2;
+                }
         }
         
@@ -594 +605 @@
                 return rc;
         
-        ext4_balloc_free_block(inode_ref, fblock);
-        
-        return EOK;
+        return ext4_balloc_free_block(inode_ref, fblock);
 }
 
@@ -721 +730 @@
         
 cleanup:
+        ;
+
+        int rc2 = EOK;
+
         /*
          * Put loaded blocks
@@ -726 +739 @@
          */
         for (uint16_t i = 1; i <= path->depth; ++i) {
-                if (path[i].block)
-                        block_put(path[i].block);
+                if (path[i].block) {
+                        rc2 = block_put(path[i].block);
+                        if (rc == EOK && rc2 != EOK)
+                                rc = rc2;
+                }
         }
         
@@ -778 +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 */
@@ -1061 +1081 @@
         
 finish:
+        ;
+
+        int rc2 = EOK;
+
         /* Set return values */
         *iblock = new_block_idx;
@@ -1070 +1094 @@
          */
         for (uint16_t i = 1; i <= path->depth; ++i) {
-                if (path[i].block)
-                        block_put(path[i].block);
+                if (path[i].block) {
+                        rc2 = block_put(path[i].block);
+                        if (rc == EOK && rc2 != EOK)
+                                rc = rc2;
+                }
         }
         

uspace/lib/ext4/libext4_filesystem.c

@@ -797 +797 @@
                 }
                 
-                block_put(block);
+                rc = block_put(block);
+                if (rc != EOK)
+                        return rc;
+
                 rc = ext4_balloc_free_block(inode_ref, fblock);
                 if (rc != EOK)
@@ -841 +844 @@
                                 }
                                 
-                                block_put(subblock);
+                                rc = block_put(subblock);
+                                if (rc != EOK)
+                                        return rc;
                         }
                         
@@ -851 +856 @@
                 }
                 
-                block_put(block);
+                rc = block_put(block);
+                if (rc != EOK)
+                        return rc;
+
                 rc = ext4_balloc_free_block(inode_ref, fblock);
                 if (rc != EOK)

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 */
@@ -215 +217 @@
                         /* 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;
+
+                                bgid++;
                                 continue;
                         }
@@ -224 +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 */
@@ -272 +285 @@
                 
                 /* 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;
         }