ext4: wait on all pending commits in ext4_sync_fs() (14ce0cb4) · Commits · 戴 / test

In ext4_sync_fs, we only wait for a commit to finish if we started it, but there may be one already in progress which will not be synced. In the case of a data=ordered umount with pending long symlinks which are delayed due to a long list of other I/O on the backing block device, this causes the buffer associated with the long symlinks to not be moved to the inode dirty list in the second phase of fsync_super. Then, before they can be dirtied again, kjournald exits, seeing the UMOUNT flag and the dirty pages are never written to the backing block device, causing long symlink corruption and exposing new or previously freed block data to userspace. To ensure all commits are synced, we flush all journal commits now when sync_fs'ing ext4. Signed-off-by:

Arthur Jones <ajones@riverbed.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

"Theodore Ts'o" <tytso@mit.edu> Cc: Eric Sandeen <sandeen@redhat.com> Cc: <linux-ext4@vger.kernel.org>

fs/ext4/super.c

+8 −11

Original line number	Diff line number	Diff line
		@@ -2884,12 +2884,9 @@ int ext4_force_commit(struct super_block *sb)
		/*
		* Ext4 always journals updates to the superblock itself, so we don't
		* have to propagate any other updates to the superblock on disk at this
		* point. Just start an async writeback to get the buffers on their way
		* to the disk.
		*
		* This implicitly triggers the writebehind on sync().
		* point. (We can probably nuke this function altogether, and remove
		* any mention to sb->s_dirt in all of fs/ext4; eventual cleanup...)
		*/

		static void ext4_write_super(struct super_block *sb)
		{
		if (mutex_trylock(&sb->s_lock) != 0)
		@@ -2899,15 +2896,15 @@ static void ext4_write_super(struct super_block *sb)

		static int ext4_sync_fs(struct super_block *sb, int wait)
		{
		tid_t target;
		int ret = 0;

		trace_mark(ext4_sync_fs, "dev %s wait %d", sb->s_id, wait);
		sb->s_dirt = 0;
		if (jbd2_journal_start_commit(EXT4_SB(sb)->s_journal, &target)) {
		if (wait)
		jbd2_log_wait_commit(EXT4_SB(sb)->s_journal, target);
		}
		return 0;
		ret = ext4_force_commit(sb);
		else
		jbd2_journal_start_commit(EXT4_SB(sb)->s_journal, NULL);
		return ret;
		}

		/*

Admin message