diff options
| author | Frederic Bohe <frederic.bohe@bull.net> | 2008-11-16 11:05:21 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-12-05 10:55:37 -0800 |
| commit | 64f7922bb38d90a2e5124613df604a0fbc5a8f53 (patch) | |
| tree | 78075132df217e54fa9f778b5d1fb8d4c57f7091 | |
| parent | 8feb19be63ca19a87697c2d6ee8db6d541f46be8 (diff) | |
ext4: Update flex_bg free blocks and free inodes counters when resizing.
(cherry picked from commit c62a11fd9555007b1caab83b5bcbb443a43e32bb)
This fixes a bug which prevented the newly created inodes after a
resize from being used on filesystems with flex_bg.
Signed-off-by: Frederic Bohe <frederic.bohe@bull.net>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | fs/ext4/resize.c | 9 | ||||
| -rw-r--r-- | fs/ext4/super.c | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index b3d35604ea18..3922a8bff1f0 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -929,6 +929,15 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input) percpu_counter_add(&sbi->s_freeinodes_counter, EXT4_INODES_PER_GROUP(sb)); + if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG)) { + ext4_group_t flex_group; + flex_group = ext4_flex_group(sbi, input->group); + sbi->s_flex_groups[flex_group].free_blocks += + input->free_blocks_count; + sbi->s_flex_groups[flex_group].free_inodes += + EXT4_INODES_PER_GROUP(sb); + } + ext4_journal_dirty_metadata(handle, sbi->s_sbh); sb->s_dirt = 1; diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 566344b926b7..062b7c5dc68f 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1504,8 +1504,11 @@ static int ext4_fill_flex_info(struct super_block *sb) sbi->s_log_groups_per_flex = sbi->s_es->s_log_groups_per_flex; groups_per_flex = 1 << sbi->s_log_groups_per_flex; - flex_group_count = (sbi->s_groups_count + groups_per_flex - 1) / - groups_per_flex; + /* We allocate both existing and potentially added groups */ + flex_group_count = ((sbi->s_groups_count + groups_per_flex - 1) + + ((sbi->s_es->s_reserved_gdt_blocks +1 ) << + EXT4_DESC_PER_BLOCK_BITS(sb))) / + groups_per_flex; sbi->s_flex_groups = kzalloc(flex_group_count * sizeof(struct flex_groups), GFP_KERNEL); if (sbi->s_flex_groups == NULL) { |