diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2018-12-31 00:10:48 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-12-31 00:10:48 -0500 |
| commit | ad211f3e94b314a910d4af03178a0b52a7d1ee0a (patch) | |
| tree | 1085f5cc536507cb1ee937e35ee6fe4d732f3993 /fs | |
| parent | e86807862e6880809f191c4cea7f88a489f0ed34 (diff) | |
| download | linux-0-day-ad211f3e94b314a910d4af03178a0b52a7d1ee0a.tar.gz linux-0-day-ad211f3e94b314a910d4af03178a0b52a7d1ee0a.tar.xz | |
ext4: use ext4_write_inode() when fsyncing w/o a journal
In no-journal mode, we previously used __generic_file_fsync() in
no-journal mode. This triggers a lockdep warning, and in addition,
it's not safe to depend on the inode writeback mechanism in the case
ext4. We can solve both problems by calling ext4_write_inode()
directly.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/fsync.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c index 26a7fe5c4fd3c..87a7ff00ef622 100644 --- a/fs/ext4/fsync.c +++ b/fs/ext4/fsync.c @@ -116,8 +116,16 @@ 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) { - ret = __generic_file_fsync(file, start, end, datasync); + struct writeback_control wbc = { + .sync_mode = WB_SYNC_ALL + }; + + ret = ext4_write_inode(inode, &wbc); if (!ret) ret = ext4_sync_parent(inode); if (test_opt(inode->i_sb, BARRIER)) @@ -125,9 +133,6 @@ 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. |