Changeset 3c8b0a8 in mainline for uspace/lib/ext4/src/ialloc.c

Timestamp:

2018-12-15T15:48:59Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

4bb4cf88

Parents:

b6d5e31 (diff), 6ea5e7a (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.

git-author:

Maurizio Lombardi <m.lombardi85@…> (2018-12-15 15:48:59)

git-committer:

GitHub <noreply@…> (2018-12-15 15:48:59)

Message:

Merge pull request #143 from maurizio-lombardi/ext4_fixes_v2

Ext4 fixes

File:

• uspace/lib/ext4/src/ialloc.c (modified) (3 diffs)

uspace/lib/ext4/src/ialloc.c

@@ -176 +176 @@
 errno_t ext4_ialloc_alloc_inode(ext4_filesystem_t *fs, uint32_t *index, bool is_dir)
 {
+        int pick_first_free = 0;
         ext4_superblock_t *sb = fs->superblock;
-
-        uint32_t bgid = 0;
-        uint32_t bg_count = ext4_superblock_get_block_group_count(sb);
-        uint32_t sb_free_inodes = ext4_superblock_get_free_inodes_count(sb);
-        uint32_t avg_free_inodes = sb_free_inodes / bg_count;
+        uint32_t bgid;
+        uint32_t sb_free_inodes;
+        uint32_t avg_free_inodes;
+        uint32_t const bg_count = ext4_superblock_get_block_group_count(sb);
+
+retry:
+
+        bgid = 0;
+        sb_free_inodes = ext4_superblock_get_free_inodes_count(sb);
+        avg_free_inodes = sb_free_inodes / bg_count;
 
         /* Try to find free i-node in all block groups */
@@ -210 +216 @@
                  * blocks.
                  */
-                if (((free_inodes >= avg_free_inodes) || (bgid == bg_count - 1)) &&
-                    (free_blocks > 0)) {
+                if (((free_inodes >= avg_free_inodes) ||
+                    (bgid == bg_count - 1) || pick_first_free) && (free_blocks > 0)) {
                         /* Load block with bitmap */
                         uint32_t bitmap_block_addr = ext4_block_group_get_inode_bitmap(
@@ -307 +313 @@
         }
 
+        /* Try again with less strict conditions */
+        if (pick_first_free == 0) {
+                pick_first_free = 1;
+                goto retry;
+        }
+
         return ENOSPC;
 }