From: Tim Shimmin Date: Mon, 15 Oct 2007 03:18:59 +0000 (+1000) Subject: [XFS] Put back the QUEUE_ORDERED_NONE test in the barrier check. X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cd514bdaa87e48b52d4074390043f19ce43ea2c4;p=deliverable%2Flinux.git [XFS] Put back the QUEUE_ORDERED_NONE test in the barrier check. Put back the QUEUE_ORDERED_NONE test which caused us grief in sles when it was taken out as, IIRC, it allowed md/lvm to be thought of as supporting barriers when they weren't in some configurations. This patch will be reverting what went in as part of a change for the SGI-pv 964544 (SGI-Modid: xfs-linux-melb:xfs-kern:28568a). SGI-PV: 971783 SGI-Modid: xfs-linux-melb:xfs-kern:29882a Signed-off-by: Tim Shimmin Signed-off-by: David Chinner --- 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");