Merge branch 'xfs-4.10-misc-fixes-4' into for-next

[mirror_ubuntu-bionic-kernel.git] / fs / xfs / xfs_log.c

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 3ebe444eb60fa526ce30032371fb8bccfb6fd951..c39ac14ff54009ba33a4a7313612bd2afb95117c 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1862,26 +1862,21 @@ xlog_sync(
 
        bp->b_io_length = BTOBB(count);
        bp->b_fspriv = iclog;
-       bp->b_flags &= ~(XBF_FUA | XBF_FLUSH);
-       bp->b_flags |= (XBF_ASYNC | XBF_SYNCIO | XBF_WRITE);
+       bp->b_flags &= ~XBF_FLUSH;
+       bp->b_flags |= (XBF_ASYNC | XBF_SYNCIO | XBF_WRITE | XBF_FUA);
 
-       if (log->l_mp->m_flags & XFS_MOUNT_BARRIER) {
-               bp->b_flags |= XBF_FUA;
-
-               /*
-                * 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 stamping the new log tail LSN into the
-                * log buffer.  For an external log we need to issue the
-                * flush explicitly, and unfortunately synchronously here;
-                * for an internal log we can simply use the block layer
-                * state machine for preflushes.
-                */
-               if (log->l_mp->m_logdev_targp != log->l_mp->m_ddev_targp)
-                       xfs_blkdev_issue_flush(log->l_mp->m_ddev_targp);
-               else
-                       bp->b_flags |= XBF_FLUSH;
-       }
+       /*
+        * 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
+        * stamping the new log tail LSN into the log buffer.  For an external
+        * log we need to issue the flush explicitly, and unfortunately
+        * synchronously here; for an internal log we can simply use the block
+        * layer state machine for preflushes.
+        */
+       if (log->l_mp->m_logdev_targp != log->l_mp->m_ddev_targp)
+               xfs_blkdev_issue_flush(log->l_mp->m_ddev_targp);
+       else
+               bp->b_flags |= XBF_FLUSH;
 
        ASSERT(XFS_BUF_ADDR(bp) <= log->l_logBBsize-1);
        ASSERT(XFS_BUF_ADDR(bp) + BTOBB(count) <= log->l_logBBsize);
@@ -1906,10 +1901,8 @@ xlog_sync(
                xfs_buf_associate_memory(bp,
                                (char *)&iclog->ic_header + count, split);
                bp->b_fspriv = iclog;
-               bp->b_flags &= ~(XBF_FUA | XBF_FLUSH);
-               bp->b_flags |= (XBF_ASYNC | XBF_SYNCIO | XBF_WRITE);
-               if (log->l_mp->m_flags & XFS_MOUNT_BARRIER)
-                       bp->b_flags |= XBF_FUA;
+               bp->b_flags &= ~XBF_FLUSH;
+               bp->b_flags |= (XBF_ASYNC | XBF_SYNCIO | XBF_WRITE | XBF_FUA);
 
                ASSERT(XFS_BUF_ADDR(bp) <= log->l_logBBsize-1);
                ASSERT(XFS_BUF_ADDR(bp) + BTOBB(count) <= log->l_logBBsize);