Commit d08d389d authored by Nathan Scott's avatar Nathan Scott

[XFS] Fix a possible forced shutdown due to mishandling write barriers

with remount,ro.

SGI-PV: 951944
SGI-Modid: xfs-linux-melb:xfs-kern:25742a
Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent 9d21f09c
...@@ -669,31 +669,22 @@ xfs_mntupdate( ...@@ -669,31 +669,22 @@ xfs_mntupdate(
xfs_mount_t *mp = XFS_BHVTOM(bdp); xfs_mount_t *mp = XFS_BHVTOM(bdp);
int error; int error;
if (args->flags & XFSMNT_BARRIER) if (!(*flags & MS_RDONLY)) { /* rw/ro -> rw */
mp->m_flags |= XFS_MOUNT_BARRIER; if (vfsp->vfs_flag & VFS_RDONLY)
else vfsp->vfs_flag &= ~VFS_RDONLY;
mp->m_flags &= ~XFS_MOUNT_BARRIER; if (args->flags & XFSMNT_BARRIER) {
mp->m_flags |= XFS_MOUNT_BARRIER;
if ((vfsp->vfs_flag & VFS_RDONLY) &&
!(*flags & MS_RDONLY)) {
vfsp->vfs_flag &= ~VFS_RDONLY;
if (args->flags & XFSMNT_BARRIER)
xfs_mountfs_check_barriers(mp); xfs_mountfs_check_barriers(mp);
} } else {
mp->m_flags &= ~XFS_MOUNT_BARRIER;
if (!(vfsp->vfs_flag & VFS_RDONLY) && }
(*flags & MS_RDONLY)) { } else if (!(vfsp->vfs_flag & VFS_RDONLY)) { /* rw -> ro */
VFS_SYNC(vfsp, SYNC_FSDATA|SYNC_BDFLUSH|SYNC_ATTR, NULL, error); VFS_SYNC(vfsp, SYNC_FSDATA|SYNC_BDFLUSH|SYNC_ATTR, NULL, error);
xfs_quiesce_fs(mp); xfs_quiesce_fs(mp);
/* Ok now write out an unmount record */
xfs_log_unmount_write(mp); xfs_log_unmount_write(mp);
xfs_unmountfs_writesb(mp); xfs_unmountfs_writesb(mp);
vfsp->vfs_flag |= VFS_RDONLY; vfsp->vfs_flag |= VFS_RDONLY;
} }
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment