Changes in uspace/lib/ext4/libext4_balloc.c [d579acc:38542dc] in mainline

File:

• uspace/lib/ext4/libext4_balloc.c (modified) (18 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) {
-                ext4_filesystem_put_block_group_ref(bg_ref);
-                return rc;
-        }
+        if (rc != EOK)
+                return rc;
         
         /* Modify bitmap */
@@ -132 +130 @@
         
         /* Release block group reference */
-        return ext4_filesystem_put_block_group_ref(bg_ref);
+        rc = ext4_filesystem_put_block_group_ref(bg_ref);
+        if (rc != EOK)
+                return rc;
+        
+        return EOK;
 }
 
@@ -171 +173 @@
         block_t *bitmap_block;
         rc = block_get(&bitmap_block, fs->device, bitmap_block_addr, 0);
-        if (rc != EOK) {
-                ext4_filesystem_put_block_group_ref(bg_ref);
-                return rc;
-        }
+        if (rc != EOK)
+                return rc;
         
         /* Modify bitmap */
@@ -212 +212 @@
         
         /* Release block group reference */
-        return ext4_filesystem_put_block_group_ref(bg_ref);
+        rc = ext4_filesystem_put_block_group_ref(bg_ref);
+        if (rc != EOK)
+                return rc;
+        
+        return EOK;
 }
 
@@ -260 +264 @@
  *
  */
-static int ext4_balloc_find_goal(ext4_inode_ref_t *inode_ref, uint32_t *goal)
+static uint32_t ext4_balloc_find_goal(ext4_inode_ref_t *inode_ref)
 {
-        *goal = 0;
+        uint32_t goal = 0;
+        
         ext4_superblock_t *sb = inode_ref->fs->superblock;
         
@@ -275 +280 @@
         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 rc;
+                        return 0;
                 
                 if (goal != 0) {
-                        (*goal)++;
-                        return EOK;
+                        goal++;
+                        return goal;
                 }
                 
@@ -297 +302 @@
             block_group, &bg_ref);
         if (rc != EOK)
-                return rc;
+                return 0;
         
         /* Compute indexes */
@@ -322 +327 @@
                 inode_table_blocks++;
         
-        *goal = inode_table_first_block + inode_table_blocks;
-        
-        return ext4_filesystem_put_block_group_ref(bg_ref);
+        goal = inode_table_first_block + inode_table_blocks;
+        
+        ext4_filesystem_put_block_group_ref(bg_ref);
+        
+        return goal;
 }
 
@@ -342 +349 @@
         block_t *bitmap_block;
         uint32_t rel_block_idx = 0;
-        uint32_t free_blocks;
-        uint32_t goal;
         
         /* Find GOAL */
-        int rc = ext4_balloc_find_goal(inode_ref, &goal);
-        if (rc != EOK)
-                return rc;
-
+        uint32_t goal = ext4_balloc_find_goal(inode_ref);
+        if (goal == 0) {
+                /* no goal found => partition is full */
+                return ENOSPC;
+        }
+        
         ext4_superblock_t *sb = inode_ref->fs->superblock;
         
@@ -359 +366 @@
         /* Load block group reference */
         ext4_block_group_ref_t *bg_ref;
-        rc = ext4_filesystem_get_block_group_ref(inode_ref->fs,
+        int rc = ext4_filesystem_get_block_group_ref(inode_ref->fs,
             block_group, &bg_ref);
         if (rc != EOK)
                 return rc;
-
-        free_blocks =
-            ext4_block_group_get_free_blocks_count(bg_ref->block_group, sb);
-        if (free_blocks == 0) {
-                /* This group has no free blocks */
-                goto goal_failed;
-        }
         
         /* Compute indexes */
@@ -467 +467 @@
         
         /* No free block found yet */
-        rc = block_put(bitmap_block);
-        if (rc != EOK) {
-                ext4_filesystem_put_block_group_ref(bg_ref);
-                return rc;
-        }
-
-goal_failed:
-
-        rc = ext4_filesystem_put_block_group_ref(bg_ref);
-        if (rc != EOK)
-                return rc;
+        block_put(bitmap_block);
+        ext4_filesystem_put_block_group_ref(bg_ref);
         
         /* Try other block groups */
@@ -490 +481 @@
                 if (rc != EOK)
                         return rc;
-
-                free_blocks =
-                     ext4_block_group_get_free_blocks_count(bg_ref->block_group, sb);
-                if (free_blocks == 0) {
-                        /* This group has no free blocks */
-                        goto next_group;
-                }
-
+                
                 /* Load block with bitmap */
                 bitmap_block_addr =
@@ -528 +512 @@
                         bitmap_block->dirty = true;
                         rc = block_put(bitmap_block);
-                        if (rc != EOK) {
-                                ext4_filesystem_put_block_group_ref(bg_ref);
+                        if (rc != EOK)
                                 return rc;
-                        }
                         
                         allocated_block =
@@ -546 +528 @@
                         bitmap_block->dirty = true;
                         rc = block_put(bitmap_block);
-                        if (rc != EOK) {
-                                ext4_filesystem_put_block_group_ref(bg_ref);
+                        if (rc != EOK)
                                 return rc;
-                        }
                         
                         allocated_block =
@@ -558 +538 @@
                 }
                 
-                rc = block_put(bitmap_block);
-                if (rc != EOK) {
-                        ext4_filesystem_put_block_group_ref(bg_ref);
-                        return rc;
-                }
-
-next_group:
-                rc = ext4_filesystem_put_block_group_ref(bg_ref);
-                if (rc != EOK)
-                        return rc;
+                block_put(bitmap_block);
+                ext4_filesystem_put_block_group_ref(bg_ref);
                 
                 /* Goto next group */
@@ -602 +574 @@
         bg_ref->dirty = true;
         
-        rc = ext4_filesystem_put_block_group_ref(bg_ref);
+        ext4_filesystem_put_block_group_ref(bg_ref);
         
         *fblock = allocated_block;
-        return rc;
+        return EOK;
 }
 
@@ -620 +592 @@
     bool *free)
 {
-        int rc;
+        int rc = EOK;
         
         ext4_filesystem_t *fs = inode_ref->fs;
@@ -641 +613 @@
         block_t *bitmap_block;
         rc = block_get(&bitmap_block, fs->device, bitmap_block_addr, 0);
-        if (rc != EOK) {
-                ext4_filesystem_put_block_group_ref(bg_ref);
-                return rc;
-        }
+        if (rc != EOK)
+                return rc;
         
         /* Check if block is free */