diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-22 01:43:56 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-22 01:43:56 +0200 |
| commit | 62a8efe632be1815b544845db643f1fcd9afcfb0 (patch) | |
| tree | ae7802a595f9618c164df22e0d997ee537e2f0ca /fs | |
| parent | Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 (diff) | |
| parent | Ext4: Fix online resize block group descriptor corruption (diff) | |
| download | linux-62a8efe632be1815b544845db643f1fcd9afcfb0.tar.xz linux-62a8efe632be1815b544845db643f1fcd9afcfb0.zip | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
Ext4: Fix online resize block group descriptor corruption
Diffstat (limited to 'fs')
| -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 9ecb92f68543..9ff7b1c04239 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -855,7 +855,8 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input) */ /* Update group descriptor block for new group */ - gdp = (struct ext4_group_desc *)primary->b_data + gdb_off; + gdp = (struct ext4_group_desc *)((char *)primary->b_data + + gdb_off * 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 */ |