diff options
| author | Tejun Heo <tj@kernel.org> | 2009-01-31 14:36:00 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-01-31 14:36:00 +0900 |
| commit | da2c0b021cde94866f1e492f940aad29e8f61258 (patch) | |
| tree | 0455f3e221d6128ba1efb68135c3fbe2c2c8b390 /fs/ext4/resize.c | |
| parent | 795f99b61d20c34cb04d17d8906b32f745a635ec (diff) | |
| parent | 33bfad54b58cf05cfe6678c3ec9235d4bc8db4c2 (diff) | |
Merge branch 'master' into tj-percpu
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 c328be5d6885..c06886abd658 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -861,12 +861,13 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input) gdp = (struct ext4_group_desc *)((char *)primary->b_data + gdb_off * EXT4_DESC_SIZE(sb)); + memset(gdp, 0, EXT4_DESC_SIZE(sb)); ext4_block_bitmap_set(sb, gdp, input->block_bitmap); /* LV FIXME */ ext4_inode_bitmap_set(sb, gdp, input->inode_bitmap); /* LV FIXME */ ext4_inode_table_set(sb, gdp, input->inode_table); /* LV FIXME */ ext4_free_blks_set(sb, gdp, input->free_blocks_count); ext4_free_inodes_set(sb, gdp, EXT4_INODES_PER_GROUP(sb)); - gdp->bg_flags |= cpu_to_le16(EXT4_BG_INODE_ZEROED); + gdp->bg_flags = cpu_to_le16(EXT4_BG_INODE_ZEROED); gdp->bg_checksum = ext4_group_desc_csum(sbi, input->group, gdp); /* |