diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2009-11-23 07:24:57 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2009-11-23 07:24:57 -0500 |
| commit | 6b17d902fdd241adfa4ce780df20547b28bf5801 (patch) | |
| tree | a5daca03108c565c58347d36b1dec70cf22ef1d1 /fs/ext4 | |
| parent | 1032988c71f3f85483b2b4319684d1205a704c02 (diff) | |
| download | linux-6b17d902fdd241adfa4ce780df20547b28bf5801.tar.gz linux-6b17d902fdd241adfa4ce780df20547b28bf5801.tar.bz2 linux-6b17d902fdd241adfa4ce780df20547b28bf5801.zip | |
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
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/fsync.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c index 2b1531266ee2..a3c25076aef1 100644 --- a/fs/ext4/fsync.c +++ b/fs/ext4/fsync.c @@ -60,7 +60,7 @@ int ext4_sync_file(struct file *file, struct dentry *dentry, int datasync) ret = flush_aio_dio_completed_IO(inode); if (ret < 0) - goto out; + return ret; /* * data=writeback: * 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 * safe in-journal, which is all fsync() needs to ensure. */ - if (ext4_should_journal_data(inode)) { - ret = ext4_force_commit(inode->i_sb); - goto out; - } + if (ext4_should_journal_data(inode)) + return ext4_force_commit(inode->i_sb); if (!journal) ret = sync_mapping_buffers(inode->i_mapping); |