Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 (8c673cbc) · Commits · 戴 / test

Pull ext4 bugfix from Ted Ts'o: "This fixes the root cause of the ext4 data corruption bug which raised a ruckus on LWN, Phoronix, and Slashdot. This bug only showed up when non-standard mount options (journal_async_commit and/or journal_checksum) were enabled, and when the file system was not cleanly unmounted, but the root cause was the inode bitmap modifications was not being properly journaled. This could potentially lead to minor file system corruptions (pass 5 complaints with the inode allocation bitmap) after an unclean shutdown under the wrong/unlucky workloads, but it turned into major failure if the journal_checksum and/or jouaral_async_commit was enabled." * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: fix unjournaled inode bitmap modification

fs/ext4/ialloc.c

+9 −10

Original line number	Diff line number	Diff line
		@@ -725,6 +725,10 @@ repeat_in_this_group:
		"inode=%lu", ino + 1);
		continue;
		}
		BUFFER_TRACE(inode_bitmap_bh, "get_write_access");
		err = ext4_journal_get_write_access(handle, inode_bitmap_bh);
		if (err)
		goto fail;
		ext4_lock_group(sb, group);
		ret2 = ext4_test_and_set_bit(ino, inode_bitmap_bh->b_data);
		ext4_unlock_group(sb, group);
		@@ -738,6 +742,11 @@ repeat_in_this_group:
		goto out;

		got:
		BUFFER_TRACE(inode_bitmap_bh, "call ext4_handle_dirty_metadata");
		err = ext4_handle_dirty_metadata(handle, NULL, inode_bitmap_bh);
		if (err)
		goto fail;

		/* We may have to initialize the block bitmap if it isn't already */
		if (ext4_has_group_desc_csum(sb) &&
		gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {
		@@ -771,11 +780,6 @@ got:
		goto fail;
		}

		BUFFER_TRACE(inode_bitmap_bh, "get_write_access");
		err = ext4_journal_get_write_access(handle, inode_bitmap_bh);
		if (err)
		goto fail;

		BUFFER_TRACE(group_desc_bh, "get_write_access");
		err = ext4_journal_get_write_access(handle, group_desc_bh);
		if (err)
		@@ -823,11 +827,6 @@ got:
		}
		ext4_unlock_group(sb, group);

		BUFFER_TRACE(inode_bitmap_bh, "call ext4_handle_dirty_metadata");
		err = ext4_handle_dirty_metadata(handle, NULL, inode_bitmap_bh);
		if (err)
		goto fail;

		BUFFER_TRACE(group_desc_bh, "call ext4_handle_dirty_metadata");
		err = ext4_handle_dirty_metadata(handle, NULL, group_desc_bh);
		if (err)

Admin message