Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62a8efe6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents bec95aab 2856922c

fs/ext4/resize.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -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 */

	/* 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_block_bitmap_set(sb, gdp, input->block_bitmap); /* LV FIXME */

	ext4_inode_bitmap_set(sb, gdp, input->inode_bitmap); /* LV FIXME */

	ext4_inode_bitmap_set(sb, gdp, input->inode_bitmap); /* LV FIXME */