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

Revert "ext4: use ext4_write_inode() when fsyncing w/o a journal"

This reverts commit ad211f3e94b314a910d4af03178a0b52a7d1ee0a.

As Jan Kara pointed out, this change was unsafe since it means we lose
the call to sync_mapping_buffers() in the nojournal case. The
original point of the commit was avoid taking the inode mutex (since
it causes a lockdep warning in generic/113); but we need the mutex in
order to call sync_mapping_buffers().

The real fix to this problem was discussed here:

https://lore.kernel.org/lkml/20181025150540.259281-4-bvanassche@acm.org

The proposed patch was to fix a syzbot complaint, but the problem can
also demonstrated via "kvm-xfstests -c nojournal generic/113".
Multiple solutions were discused in the e-mail thread, but none have
landed in the kernel as of this writing. Anyway, commit
ad211f3e94b314 is absolutely the wrong way to suppress the lockdep, so
revert it.

Fixes: ad211f3e94b314a910d4af03178a0b52a7d1ee0a ("ext4: use ext4_write_inode() when fsyncing w/o a journal")
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reported: Jan Kara <jack@suse.cz>

+4 -9
+4 -9
fs/ext4/fsync.c
··· 116 116 goto out; 117 117 } 118 118 119 - ret = file_write_and_wait_range(file, start, end); 120 - if (ret) 121 - return ret; 122 - 123 119 if (!journal) { 124 - struct writeback_control wbc = { 125 - .sync_mode = WB_SYNC_ALL 126 - }; 127 - 128 - ret = ext4_write_inode(inode, &wbc); 120 + ret = __generic_file_fsync(file, start, end, datasync); 129 121 if (!ret) 130 122 ret = ext4_sync_parent(inode); 131 123 if (test_opt(inode->i_sb, BARRIER)) ··· 125 133 goto out; 126 134 } 127 135 136 + ret = file_write_and_wait_range(file, start, end); 137 + if (ret) 138 + return ret; 128 139 /* 129 140 * data=writeback,ordered: 130 141 * The caller's filemap_fdatawrite()/wait will sync the data.