Changeset 15d0046 in mainline for uspace/lib/ext4/libext4_balloc.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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 mainline changes

File:

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

uspace/lib/ext4/libext4_balloc.c

@@ -342 +342 @@
         block_t *bitmap_block;
         uint32_t rel_block_idx = 0;
+        uint32_t free_blocks;
         uint32_t goal;
         
@@ -348 +349 @@
         if (rc != EOK)
                 return rc;
-        else if (goal == 0) {
-                /* no goal found => partition is full */
-                return ENOMEM;
-        }
-        
+
         ext4_superblock_t *sb = inode_ref->fs->superblock;
         
@@ -366 +363 @@
         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 */
@@ -469 +473 @@
         }
 
+goal_failed:
+
         rc = ext4_filesystem_put_block_group_ref(bg_ref);
         if (rc != EOK)
@@ -484 +490 @@
                 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 =
@@ -551 +564 @@
                 }
 
+next_group:
                 rc = ext4_filesystem_put_block_group_ref(bg_ref);
                 if (rc != EOK)