aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-06-28 10:34:34 -0400
committerAlex Elder <aelder@sgi.com>2010-07-26 14:16:45 -0400
commit651701d71da4dc0ac607f17a638e77906f0d280e (patch)
tree13df2162d97f9fdd7bb6e2789740fc6e8225b123 /fs/xfs
parent2727ccc950ae17375b15005403e1c35ba8fec1df (diff)
xfs: remove incorrect log write optimization
We do need a barrier for the first buffer of a split log write. Otherwise we might incorrectly stamp the tail LSN into transactions in the first part of the split write, or not flush data I/O before updating the inode size. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_log.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 5a5a54ad3685..f309e1404fd6 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1423,11 +1423,8 @@ xlog_sync(xlog_t *log,
1423 XFS_BUF_BUSY(bp); 1423 XFS_BUF_BUSY(bp);
1424 XFS_BUF_ASYNC(bp); 1424 XFS_BUF_ASYNC(bp);
1425 bp->b_flags |= XBF_LOG_BUFFER; 1425 bp->b_flags |= XBF_LOG_BUFFER;
1426 /* 1426
1427 * Do an ordered write for the log block. 1427 if (log->l_mp->m_flags & XFS_MOUNT_BARRIER)
1428 * Its unnecessary to flush the first split block in the log wrap case.
1429 */
1430 if (!split && (log->l_mp->m_flags & XFS_MOUNT_BARRIER))
1431 XFS_BUF_ORDERED(bp); 1428 XFS_BUF_ORDERED(bp);
1432 1429
1433 ASSERT(XFS_BUF_ADDR(bp) <= log->l_logBBsize-1); 1430 ASSERT(XFS_BUF_ADDR(bp) <= log->l_logBBsize-1);