ext4: Fix initalization of s_flex_groups
authorTheodore Ts'o <tytso@mit.edu>
Fri, 11 Sep 2009 20:51:28 +0000 (16:51 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 11 Sep 2009 20:51:28 +0000 (16:51 -0400)
The s_flex_groups array should have been initialized using atomic_add
to sum up the free counts from the block groups that make up a
flex_bg.  By using atomic_set, the value of the s_flex_groups array
was set to the values of the last block group in the flex_bg.

The impact of this bug is that the block and inode allocation
algorithms might not pick the best flex_bg for new allocation.

Thanks to Damien Guibouret for pointing out this problem!

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
fs/ext4/super.c

index 9f6fa3f746294c7a817aaf4ea5dfceee35e72f8d..04c6933573360b40909212fc9a9fc91ad10cd0c6 100644 (file)
@@ -1694,12 +1694,12 @@ static int ext4_fill_flex_info(struct super_block *sb)
                gdp = ext4_get_group_desc(sb, i, NULL);
 
                flex_group = ext4_flex_group(sbi, i);
-               atomic_set(&sbi->s_flex_groups[flex_group].free_inodes,
-                          ext4_free_inodes_count(sb, gdp));
-               atomic_set(&sbi->s_flex_groups[flex_group].free_blocks,
-                          ext4_free_blks_count(sb, gdp));
-               atomic_set(&sbi->s_flex_groups[flex_group].used_dirs,
-                          ext4_used_dirs_count(sb, gdp));
+               atomic_add(ext4_free_inodes_count(sb, gdp),
+                          &sbi->s_flex_groups[flex_group].free_inodes);
+               atomic_add(ext4_free_blks_count(sb, gdp),
+                          &sbi->s_flex_groups[flex_group].free_blocks);
+               atomic_add(ext4_used_dirs_count(sb, gdp),
+                          &sbi->s_flex_groups[flex_group].used_dirs);
        }
 
        return 1;