| From 7f93bc075c55fa4dfdf1bd96fed3778794ca8d2a Mon Sep 17 00:00:00 2001 |
| From: Theodore Ts'o <tytso@mit.edu> |
| Date: Mon, 23 Nov 2009 07:24:57 -0500 |
| Subject: [PATCH 69/85] ext4: avoid issuing unnecessary barriers |
| |
| (cherry picked from commit 6b17d902fdd241adfa4ce780df20547b28bf5801) |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| fs/ext4/fsync.c | 8 +++----- |
| 1 file changed, 3 insertions(+), 5 deletions(-) |
| |
| --- a/fs/ext4/fsync.c |
| +++ b/fs/ext4/fsync.c |
| @@ -60,7 +60,7 @@ int ext4_sync_file(struct file *file, st |
| |
| 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, st |
| * (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); |
