Commit 2e537a0b authored by Eric Sandeen's avatar Eric Sandeen Committed by Greg Kroah-Hartman

xfs: toggle readonly state around xfs_log_mount_finish

commit 6f4a1eef upstream.

When we do log recovery on a readonly mount, unlinked inode
processing does not happen due to the readonly checks in
xfs_inactive(), which are trying to prevent any I/O on a
readonly mount.

This is misguided - we do I/O on readonly mounts all the time,
for consistency; for example, log recovery.  So do the same
RDONLY flag twiddling around xfs_log_mount_finish() as we
do around xfs_log_mount(), for the same reason.

This all cries out for a big rework but for now this is a
simple fix to an obvious problem.
Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cc84db7b
...@@ -743,10 +743,14 @@ xfs_log_mount_finish( ...@@ -743,10 +743,14 @@ xfs_log_mount_finish(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
int error = 0; int error = 0;
bool readonly = (mp->m_flags & XFS_MOUNT_RDONLY);
if (mp->m_flags & XFS_MOUNT_NORECOVERY) { if (mp->m_flags & XFS_MOUNT_NORECOVERY) {
ASSERT(mp->m_flags & XFS_MOUNT_RDONLY); ASSERT(mp->m_flags & XFS_MOUNT_RDONLY);
return 0; return 0;
} else if (readonly) {
/* Allow unlinked processing to proceed */
mp->m_flags &= ~XFS_MOUNT_RDONLY;
} }
/* /*
...@@ -764,6 +768,9 @@ xfs_log_mount_finish( ...@@ -764,6 +768,9 @@ xfs_log_mount_finish(
xfs_log_work_queue(mp); xfs_log_work_queue(mp);
mp->m_super->s_flags &= ~MS_ACTIVE; mp->m_super->s_flags &= ~MS_ACTIVE;
if (readonly)
mp->m_flags |= XFS_MOUNT_RDONLY;
return error; return error;
} }
......
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