[XFS] enable write barriers by default

SGI-PV: 912426
SGI-Modid: xfs-linux-melb:xfs-kern:201981a

Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 6116b5bf433e..d8ec7463d8f4 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -306,6 +306,7 @@ xfs_mountfs_check_barriers(xfs_mount_t *mp)
                 xfs_fs_cmn_err(CE_NOTE, mp,
                   "Disabling barriers, not supported with external log device");
                 mp->m_flags &= ~XFS_MOUNT_BARRIER;
+                return;
         }
 
         if (mp->m_ddev_targp->pbr_bdev->bd_disk->queue->ordered ==
@@ -313,6 +314,7 @@ xfs_mountfs_check_barriers(xfs_mount_t *mp)
                 xfs_fs_cmn_err(CE_NOTE, mp,
                   "Disabling barriers, not supported by the underlying device");
                 mp->m_flags &= ~XFS_MOUNT_BARRIER;
+                return;
         }
 
         error = xfs_barrier_test(mp);
@@ -320,6 +322,7 @@ xfs_mountfs_check_barriers(xfs_mount_t *mp)
                 xfs_fs_cmn_err(CE_NOTE, mp,
                   "Disabling barriers, trial barrier write failed");
                 mp->m_flags &= ~XFS_MOUNT_BARRIER;
+                return;
         }
 }