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

Pull ext4 fix from Ted Ts'o: "Revert a commit which landed in v5.0-rc1 since it makes fsync in ext4 nojournal mode unsafe" * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: Revert "ext4: use ext4_write_inode() when fsyncing w/o a journal"

fs/ext4/fsync.c

+4 −9

Original line number	Diff line number	Diff line
		@@ -116,16 +116,8 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
		goto out;
		}

		ret = file_write_and_wait_range(file, start, end);
		if (ret)
		return ret;

		if (!journal) {
		struct writeback_control wbc = {
		.sync_mode = WB_SYNC_ALL
		};

		ret = ext4_write_inode(inode, &wbc);
		ret = __generic_file_fsync(file, start, end, datasync);
		if (!ret)
		ret = ext4_sync_parent(inode);
		if (test_opt(inode->i_sb, BARRIER))
		@@ -133,6 +125,9 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
		goto out;
		}

		ret = file_write_and_wait_range(file, start, end);
		if (ret)
		return ret;
		/*
		* data=writeback,ordered:
		* The caller's filemap_fdatawrite()/wait will sync the data.

Admin message