1 files changed, 8 insertions, 0 deletions

diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 02ec14eeb0ce..f90485828584 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -303,6 +303,14 @@ xfs_mountfs_check_barriers(xfs_mount_t *mp)
                 return;
         }
 
+        if (mp->m_ddev_targp->bt_bdev->bd_disk->queue->ordered ==
+                                        QUEUE_ORDERED_NONE) {
+                xfs_fs_cmn_err(CE_NOTE, mp,
+                  "Disabling barriers, not supported by the underlying device");
+                mp->m_flags &= ~XFS_MOUNT_BARRIER;
+                return;
+        }
+
         if (xfs_readonly_buftarg(mp->m_ddev_targp)) {
                 xfs_fs_cmn_err(CE_NOTE, mp,
                   "Disabling barriers, underlying device is readonly");