Changeset ff381a7 in mainline for uspace/lib/ext4/libext4_ialloc.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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_ialloc.c (modified) (1 diff)

uspace/lib/ext4/libext4_ialloc.c

@@ -195 +195 @@
                 uint32_t used_dirs = ext4_block_group_get_used_dirs_count(bg, sb);
                 
-                /* Check if this block group is good candidate for allocation */
-                if ((free_inodes >= avg_free_inodes) && (free_blocks > 0)) {
+                /*
+                 * Check if this block group is a good candidate
+                 * for allocation.
+                 *
+                 * The criterion is based on the average number
+                 * of free inodes, unless we examine the last block
+                 * group. In that case the last block group might
+                 * have less than the average number of free inodes,
+                 * but it still needs to be taken as a candidate
+                 * because the previous block groups have zero free
+                 * blocks.
+                 */
+                if (((free_inodes >= avg_free_inodes) || (bgid == bg_count - 1)) &&
+                    (free_blocks > 0)) {
                         /* Load block with bitmap */
                         uint32_t bitmap_block_addr = ext4_block_group_get_inode_bitmap(