diff options
| author | Tim Shimmin <tes@sgi.com> | 2007-10-15 13:18:59 +1000 |
|---|---|---|
| committer | Tim Shimmin <tes@chook.melbourne.sgi.com> | 2007-10-16 14:23:21 +1000 |
| commit | cd514bdaa87e48b52d4074390043f19ce43ea2c4 (patch) | |
| tree | e481409645bc53921eaef606b85798bdb257e1c6 /fs | |
| parent | bebf963fec2f319d162c18d06b6592f572c9c101 (diff) | |
| download | linux-cd514bdaa87e48b52d4074390043f19ce43ea2c4.tar.gz linux-cd514bdaa87e48b52d4074390043f19ce43ea2c4.tar.bz2 linux-cd514bdaa87e48b52d4074390043f19ce43ea2c4.zip | |
[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 <tes@sgi.com>
Signed-off-by: David Chinner <dgc@sgi.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 8 |
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"); |