From: Theodore Ts'o Subject: [PATCH] ext4: Avoid issuing unnecessary barriers Date: Sun, 15 Nov 2009 21:40:42 -0500 Message-ID: <1258339242-2028-1-git-send-email-tytso@mit.edu> References: <20091116004757.GN4323@mit.edu> Cc: Theodore Ts'o , Jan Kara To: Ext4 Developers List Return-path: Received: from thunk.org ([69.25.196.29]:44035 "EHLO thunker.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751246AbZKPCkq (ORCPT ); Sun, 15 Nov 2009 21:40:46 -0500 In-Reply-To: <20091116004757.GN4323@mit.edu> Sender: linux-ext4-owner@vger.kernel.org List-ID: 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" Cc: Jan Kara --- This patch should be equivalent to Jan's "ext4: Avoid issuing barriers on error recovery path", but it removes more lines than it adds. :-) 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 2b15312..a3c2507 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); -- 1.6.5.216.g5288a.dirty