diff options
author | Eric Sandeen <sandeen@sandeen.net> | 2008-07-18 03:12:18 -0400 |
---|---|---|
committer | Niv Sardi <xaiki@debian.org> | 2008-07-28 02:59:26 -0400 |
commit | deeb5912db12e8b7ccf3f4b1afaad60bc29abed9 (patch) | |
tree | a348dab8dc552802e12c824bad287c8a6672ebf4 /fs | |
parent | 9f8868ffb39c2f80ba69df4552cb530b6634f646 (diff) |
[XFS] Disable queue flag test in barrier check.
md raid1 can pass down barriers, but does not set an ordered flag on the
queue, so xfs does not even attempt a barrier write, and will never use
barriers on these block devices.
Remove the flag check and just let the barrier write test determine
barrier support.
A possible risk here is that if something does not set an ordered flag and
also does not properly return an error on a barrier write... but if it's
any consolation jbd/ext3/reiserfs never test the flag, and don't even do a
test write, they just disable barriers the first time an actual journal
barrier write fails.
SGI-PV: 983924
SGI-Modid: xfs-linux-melb:xfs-kern:31377a
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Tim Shimmin <tes@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index 7c621dfee73d..fcb4931902ac 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c | |||
@@ -746,14 +746,6 @@ xfs_mountfs_check_barriers(xfs_mount_t *mp) | |||
746 | return; | 746 | return; |
747 | } | 747 | } |
748 | 748 | ||
749 | if (mp->m_ddev_targp->bt_bdev->bd_disk->queue->ordered == | ||
750 | QUEUE_ORDERED_NONE) { | ||
751 | xfs_fs_cmn_err(CE_NOTE, mp, | ||
752 | "Disabling barriers, not supported by the underlying device"); | ||
753 | mp->m_flags &= ~XFS_MOUNT_BARRIER; | ||
754 | return; | ||
755 | } | ||
756 | |||
757 | if (xfs_readonly_buftarg(mp->m_ddev_targp)) { | 749 | if (xfs_readonly_buftarg(mp->m_ddev_targp)) { |
758 | xfs_fs_cmn_err(CE_NOTE, mp, | 750 | xfs_fs_cmn_err(CE_NOTE, mp, |
759 | "Disabling barriers, underlying device is readonly"); | 751 | "Disabling barriers, underlying device is readonly"); |