diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-20 22:29:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-20 22:29:08 -0700 |
| commit | 9f6ec8d697c08963d83880ccd35c13c5ace716ea (patch) | |
| tree | ad8d93cf6fcdd09b86ade09f5fcbbc66cdb1cca2 /fs/xfs/xfs_log.c | |
| parent | 4aa3a715551c93eda32d79bd52042ce500bd5383 (diff) | |
| parent | 56299378726d5f2ba8d3c8cbbd13cb280ba45e4f (diff) | |
| download | blackbird-op-linux-9f6ec8d697c08963d83880ccd35c13c5ace716ea.tar.gz blackbird-op-linux-9f6ec8d697c08963d83880ccd35c13c5ace716ea.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c
net/netfilter/ipvs/ip_vs_core.c
Diffstat (limited to 'fs/xfs/xfs_log.c')
| -rw-r--r-- | fs/xfs/xfs_log.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 211930246f20..41d5b8f2bf92 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -1372,8 +1372,17 @@ xlog_sync(xlog_t *log, XFS_BUF_ASYNC(bp); bp->b_flags |= XBF_LOG_BUFFER; - if (log->l_mp->m_flags & XFS_MOUNT_BARRIER) + if (log->l_mp->m_flags & XFS_MOUNT_BARRIER) { + /* + * If we have an external log device, flush the data device + * before flushing the log to make sure all meta data + * written back from the AIL actually made it to disk + * before writing out the new log tail LSN in the log buffer. + */ + if (log->l_mp->m_logdev_targp != log->l_mp->m_ddev_targp) + xfs_blkdev_issue_flush(log->l_mp->m_ddev_targp); XFS_BUF_ORDERED(bp); + } ASSERT(XFS_BUF_ADDR(bp) <= log->l_logBBsize-1); ASSERT(XFS_BUF_ADDR(bp) + BTOBB(count) <= log->l_logBBsize); |
