tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'linus-hot-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

* 'linus-hot-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: fix on-line resizing regression

Linus Torvalds 55fb78a3 08861c71

+5
unified split
+5
fs/ext4/resize.c
··· 232 GFP_NOFS); 233 if (err) 234 goto exit_bh; 235 236 ext4_debug("mark block bitmap %#04llx (+%llu)\n", input->block_bitmap, 237 input->block_bitmap - start); ··· 249 err = sb_issue_zeroout(sb, block, sbi->s_itb_per_group, GFP_NOFS); 250 if (err) 251 goto exit_bh; 252 253 if ((err = extend_or_restart_transaction(handle, 2, bh))) 254 goto exit_bh;
··· 232 GFP_NOFS); 233 if (err) 234 goto exit_bh; 235 + for (i = 0, bit = gdblocks + 1; i < reserved_gdb; i++, bit++) 236 + ext4_set_bit(bit, bh->b_data); 237 238 ext4_debug("mark block bitmap %#04llx (+%llu)\n", input->block_bitmap, 239 input->block_bitmap - start); ··· 247 err = sb_issue_zeroout(sb, block, sbi->s_itb_per_group, GFP_NOFS); 248 if (err) 249 goto exit_bh; 250 + for (i = 0, bit = input->inode_table - start; 251 + i < sbi->s_itb_per_group; i++, bit++) 252 + ext4_set_bit(bit, bh->b_data); 253 254 if ((err = extend_or_restart_transaction(handle, 2, bh))) 255 goto exit_bh;