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

+2 -1
+2 -1
fs/ext4/resize.c
··· 855 855 */ 856 856 857 857 /* Update group descriptor block for new group */ 858 - gdp = (struct ext4_group_desc *)primary->b_data + gdb_off; 858 + gdp = (struct ext4_group_desc *)((char *)primary->b_data + 859 + gdb_off * EXT4_DESC_SIZE(sb)); 859 860 860 861 ext4_block_bitmap_set(sb, gdp, input->block_bitmap); /* LV FIXME */ 861 862 ext4_inode_bitmap_set(sb, gdp, input->inode_bitmap); /* LV FIXME */