From 092b2d2e047c35585a65184e47e0e55bc68612d3 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Mon, 28 Jun 2010 10:34:34 -0400
Subject: [PATCH] --- yaml --- r: 201757 b: refs/heads/master c:
 651701d71da4dc0ac607f17a638e77906f0d280e h: refs/heads/master i:   201755:
 e4400aee8b6e7bf16030bfbfe16e34714f526dc8 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/xfs/xfs_log.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 1e7d4ed3e4a1..9f9d3f263a24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2727ccc950ae17375b15005403e1c35ba8fec1df
+refs/heads/master: 651701d71da4dc0ac607f17a638e77906f0d280e
diff --git a/trunk/fs/xfs/xfs_log.c b/trunk/fs/xfs/xfs_log.c
index 5a5a54ad3685..f309e1404fd6 100644
--- a/trunk/fs/xfs/xfs_log.c
+++ b/trunk/fs/xfs/xfs_log.c
@@ -1423,11 +1423,8 @@ xlog_sync(xlog_t		*log,
 	XFS_BUF_BUSY(bp);
 	XFS_BUF_ASYNC(bp);
 	bp->b_flags |= XBF_LOG_BUFFER;
-	/*
-	 * Do an ordered write for the log block.
-	 * Its unnecessary to flush the first split block in the log wrap case.
-	 */
-	if (!split && (log->l_mp->m_flags & XFS_MOUNT_BARRIER))
+
+	if (log->l_mp->m_flags & XFS_MOUNT_BARRIER)
 		XFS_BUF_ORDERED(bp);
 
 	ASSERT(XFS_BUF_ADDR(bp) <= log->l_logBBsize-1);