diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-05 08:23:11 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-05 08:23:11 +1000 |
commit | 1782101552706845e226c2876b77868749efd0a5 (patch) | |
tree | 3f9f37002bc0fa61e85b0b5dd7d147eab37bff7e /fs/ext4/resize.c | |
parent | 57afa972a4698ff25906c504206ec4ee493966fa (diff) | |
parent | de766fda10a9ea3f0d24cf78ec590cbc9edce22e (diff) |
Merge remote branch 'ext4/next'
Diffstat (limited to 'fs/ext4/resize.c')
-rw-r--r-- | fs/ext4/resize.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 5692c48754a0..6df797eb9aeb 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -911,7 +911,8 @@ 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)) { + if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG) && + sbi->s_log_groups_per_flex) { ext4_group_t flex_group; flex_group = ext4_flex_group(sbi, input->group); atomic_add(input->free_blocks_count, |