From 7451592ee510c80ba06bcc615a8d484e2e213418 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Thu, 15 Apr 2010 22:24:26 +0200
Subject: [PATCH] --- yaml --- r: 196247 b: refs/heads/master c:
 5277970878a32e437b27296e34c592e5d351f11d h: refs/heads/master i:   196245:
 e710eac8844c19efd873bdc07f26e22642f76a21   196243:
 86d9f09f71267a4466ed8c485f417d84701f061d   196239:
 da8defa520ae00e88aa63bfadaa141fb12f9c8f0 v: v3

---
 [refs]                 |  2 +-
 trunk/fs/ext3/fsync.c  | 20 +++++++++-----------
 trunk/fs/jbd/journal.c |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 78863321d2ea..8c6a6e64580e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03f4d804a1b4748885dc4613a4afe10089a731c8
+refs/heads/master: 5277970878a32e437b27296e34c592e5d351f11d
diff --git a/trunk/fs/ext3/fsync.c b/trunk/fs/ext3/fsync.c
index 8209f266e9ad..26289e8f4163 100644
--- a/trunk/fs/ext3/fsync.c
+++ b/trunk/fs/ext3/fsync.c
@@ -48,7 +48,7 @@ int ext3_sync_file(struct file * file, struct dentry *dentry, int datasync)
 	struct inode *inode = dentry->d_inode;
 	struct ext3_inode_info *ei = EXT3_I(inode);
 	journal_t *journal = EXT3_SB(inode->i_sb)->s_journal;
-	int ret = 0;
+	int ret, needs_barrier = 0;
 	tid_t commit_tid;
 
 	if (inode->i_sb->s_flags & MS_RDONLY)
@@ -70,28 +70,26 @@ int ext3_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 (ext3_should_journal_data(inode)) {
-		ret = ext3_force_commit(inode->i_sb);
-		goto out;
-	}
+	if (ext3_should_journal_data(inode))
+		return ext3_force_commit(inode->i_sb);
 
 	if (datasync)
 		commit_tid = atomic_read(&ei->i_datasync_tid);
 	else
 		commit_tid = atomic_read(&ei->i_sync_tid);
 
-	if (log_start_commit(journal, commit_tid)) {
-		log_wait_commit(journal, commit_tid);
-		goto out;
-	}
+	if (test_opt(inode->i_sb, BARRIER) &&
+	    !journal_trans_will_send_data_barrier(journal, commit_tid))
+		needs_barrier = 1;
+	log_start_commit(journal, commit_tid);
+	ret = log_wait_commit(journal, commit_tid);
 
 	/*
 	 * In case we didn't commit a transaction, we have to flush
 	 * disk caches manually so that data really is on persistent
 	 * storage
 	 */
-	if (test_opt(inode->i_sb, BARRIER))
+	if (needs_barrier)
 		blkdev_issue_flush(inode->i_sb->s_bdev, NULL);
-out:
 	return ret;
 }
diff --git a/trunk/fs/jbd/journal.c b/trunk/fs/jbd/journal.c
index 99c71940155a..93d1e47647bd 100644
--- a/trunk/fs/jbd/journal.c
+++ b/trunk/fs/jbd/journal.c
@@ -594,7 +594,7 @@ int journal_trans_will_send_data_barrier(journal_t *journal, tid_t tid)
 	spin_unlock(&journal->j_state_lock);
 	return ret;
 }
-EXPORT_SYMBOL(journal_commit_will_send_barrier);
+EXPORT_SYMBOL(journal_trans_will_send_data_barrier);
 
 /*
  * Log buffer allocation routines: