mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
ext4: avoid issuing unnecessary barriers
We don't to issue an I/O barrier on an error or if we force commit because we are doing data journaling. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Cc: Jan Kara <jack@suse.cz> Cc: stable@kernel.org
This commit is contained in:
parent
1032988c71
commit
6b17d902fd
1 changed files with 3 additions and 5 deletions
|
@ -60,7 +60,7 @@ int ext4_sync_file(struct file *file, struct dentry *dentry, int datasync)
|
||||||
|
|
||||||
ret = flush_aio_dio_completed_IO(inode);
|
ret = flush_aio_dio_completed_IO(inode);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto out;
|
return ret;
|
||||||
/*
|
/*
|
||||||
* data=writeback:
|
* data=writeback:
|
||||||
* The caller's filemap_fdatawrite()/wait will sync the data.
|
* The caller's filemap_fdatawrite()/wait will sync the data.
|
||||||
|
@ -79,10 +79,8 @@ int ext4_sync_file(struct file *file, struct dentry *dentry, int datasync)
|
||||||
* (they were dirtied by commit). But that's OK - the blocks are
|
* (they were dirtied by commit). But that's OK - the blocks are
|
||||||
* safe in-journal, which is all fsync() needs to ensure.
|
* safe in-journal, which is all fsync() needs to ensure.
|
||||||
*/
|
*/
|
||||||
if (ext4_should_journal_data(inode)) {
|
if (ext4_should_journal_data(inode))
|
||||||
ret = ext4_force_commit(inode->i_sb);
|
return ext4_force_commit(inode->i_sb);
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!journal)
|
if (!journal)
|
||||||
ret = sync_mapping_buffers(inode->i_mapping);
|
ret = sync_mapping_buffers(inode->i_mapping);
|
||||||
|
|
Loading…
Reference in a new issue