summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_vfsops.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-07-29 01:39:26 -0400
committerJeff Garzik <jeff@garzik.org>2006-07-29 01:39:26 -0400
commit5b85f29ca453d56d83cdffa075d615583bb8fb72 (patch)
treea553754dcef01a22a6bd6e2eeb2fd4eb69bf5b37 /fs/xfs/xfs_vfsops.c
parent48cb37bd9e053429aacb7c2726da3300aba60c68 (diff)
parentab3b3fd38125be0242c2f94bf144b48054210882 (diff)
downloadkernel-crypto-5b85f29ca453d56d83cdffa075d615583bb8fb72.tar.gz
kernel-crypto-5b85f29ca453d56d83cdffa075d615583bb8fb72.tar.xz
kernel-crypto-5b85f29ca453d56d83cdffa075d615583bb8fb72.zip
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'fs/xfs/xfs_vfsops.c')
-rw-r--r--fs/xfs/xfs_vfsops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index 6c96391f3f1..b427d220a16 100644
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -515,7 +515,7 @@ xfs_mount(
if (error)
goto error2;
- if ((mp->m_flags & XFS_MOUNT_BARRIER) && !(vfsp->vfs_flag & VFS_RDONLY))
+ if (mp->m_flags & XFS_MOUNT_BARRIER)
xfs_mountfs_check_barriers(mp);
error = XFS_IOINIT(vfsp, args, flags);