Add ext4-printk-throttling patch
[ext4-patch-queue.git] / update-flex-bg-counters-when-resizing
blobfaa09c3abf388b7fe9fe8440e12e95ca395bbab7
1 From: Frederic Bohe <frederic.bohe@bull.net>
3 Update flex_bg free blocks and free inodes counters when resizing.
5 This fixes a bug which prevented the newly created inodes after a
6 resize from being used on filesystems with flex_bg.
8 Signed-off-by: Frederic Bohe <frederic.bohe@bull.net>
9 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
10 ---
11 This patch fixes a bug which prevents to use the newly created inodes
12 after a resize with flex bg.  I am not sure if it is really usefull to
13 update free blocks too, but it is definitely cleaner code.
15  resize.c |    9 +++++++++
16  super.c  |    7 +++++--
17  2 files changed, 14 insertions(+), 2 deletions(-)
19 Index: linux-2.6.27-rc5+patch_queue/fs/ext4/resize.c
20 ===================================================================
21 --- linux-2.6.27-rc5+patch_queue.orig/fs/ext4/resize.c  2008-09-01 11:23:09.000000000 +0200
22 +++ linux-2.6.27-rc5+patch_queue/fs/ext4/resize.c       2008-09-01 13:16:03.000000000 +0200
23 @@ -929,6 +929,15 @@ int ext4_group_add(struct super_block *s
24         percpu_counter_add(&sbi->s_freeinodes_counter,
25                            EXT4_INODES_PER_GROUP(sb));
27 +       if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG)) {
28 +               ext4_group_t flex_group;
29 +               flex_group = ext4_flex_group(sbi, input->group);
30 +               sbi->s_flex_groups[flex_group].free_blocks +=
31 +                       input->free_blocks_count;
32 +               sbi->s_flex_groups[flex_group].free_inodes +=
33 +                       EXT4_INODES_PER_GROUP(sb);
34 +       }
36         ext4_journal_dirty_metadata(handle, sbi->s_sbh);
37         sb->s_dirt = 1;
39 Index: linux-2.6.27-rc5+patch_queue/fs/ext4/super.c
40 ===================================================================
41 --- linux-2.6.27-rc5+patch_queue.orig/fs/ext4/super.c   2008-09-01 12:38:03.000000000 +0200
42 +++ linux-2.6.27-rc5+patch_queue/fs/ext4/super.c        2008-09-01 13:29:39.000000000 +0200
43 @@ -1507,8 +1507,11 @@ static int ext4_fill_flex_info(struct su
44         sbi->s_log_groups_per_flex = sbi->s_es->s_log_groups_per_flex;
45         groups_per_flex = 1 << sbi->s_log_groups_per_flex;
47 -       flex_group_count = (sbi->s_groups_count + groups_per_flex - 1) /
48 -               groups_per_flex;
49 +       /* We allocate both existing and potentially added groups */
50 +       flex_group_count = ((sbi->s_groups_count + groups_per_flex - 1) +
51 +                           ((sbi->s_es->s_reserved_gdt_blocks +1 ) <<
52 +                             EXT4_DESC_PER_BLOCK_BITS(sb))) /
53 +                          groups_per_flex;
54         sbi->s_flex_groups = kzalloc(flex_group_count *
55                                      sizeof(struct flex_groups), GFP_KERNEL);
56         if (sbi->s_flex_groups == NULL) {
61 To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
62 the body of a message to majordomo@vger.kernel.org
63 More majordomo info at  http://vger.kernel.org/majordomo-info.html