Changes in uspace/lib/ext4/libext4_ialloc.c [38542dc:8a45707d] in mainline

File:

• uspace/lib/ext4/libext4_ialloc.c (modified) (5 diffs)

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(
@@ -204 +216 @@
                         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 +229 @@
                         /* 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 +247 @@
                         
                         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 +297 @@
                 
                 /* 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;
         }