On Thu, Oct 24, 2019 at 03:51:27PM +0800, Ian Kent wrote:
> Factor the remount read only code into a helper to simplify the
> subsequent change from the super block method .remount_fs to the
> mount-api fs_context_operations method .reconfigure.
>
> This helper is only used by the mount code, so locate it along with
> that code.
>
> While we are at it change STATIC -> static for xfs_save_resvblks().
>
> Signed-off-by: Ian Kent <raven@xxxxxxxxxx>
> Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Looks like a straightforward code extraction, so
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_super.c | 76 +++++++++++++++++++++++++++++++---------------------
> 1 file changed, 45 insertions(+), 31 deletions(-)
>
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index c07e41489e75..97c3f1edb69c 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -48,6 +48,7 @@ static struct xfs_kobj xfs_dbg_kobj; /* global debug sysfs attrs */
> #endif
>
> static void xfs_restore_resvblks(struct xfs_mount *mp);
> +static void xfs_save_resvblks(struct xfs_mount *mp);
>
> /*
> * Table driven mount option parser.
> @@ -519,6 +520,47 @@ xfs_remount_rw(
> return 0;
> }
>
> +static int
> +xfs_remount_ro(
> + struct xfs_mount *mp)
> +{
> + int error;
> +
> + /*
> + * Cancel background eofb scanning so it cannot race with the final
> + * log force+buftarg wait and deadlock the remount.
> + */
> + xfs_stop_block_reaping(mp);
> +
> + /* Get rid of any leftover CoW reservations... */
> + error = xfs_icache_free_cowblocks(mp, NULL);
> + if (error) {
> + xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
> + return error;
> + }
> +
> + /* Free the per-AG metadata reservation pool. */
> + error = xfs_fs_unreserve_ag_blocks(mp);
> + if (error) {
> + xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
> + return error;
> + }
> +
> + /*
> + * Before we sync the metadata, we need to free up the reserve block
> + * pool so that the used block count in the superblock on disk is
> + * correct at the end of the remount. Stash the current* reserve pool
> + * size so that if we get remounted rw, we can return it to the same
> + * size.
> + */
> + xfs_save_resvblks(mp);
> +
> + xfs_quiesce_attr(mp);
> + mp->m_flags |= XFS_MOUNT_RDONLY;
> +
> + return 0;
> +}
> +
> struct proc_xfs_info {
> uint64_t flag;
> char *str;
> @@ -1224,7 +1266,7 @@ xfs_fs_statfs(
> return 0;
> }
>
> -STATIC void
> +static void
> xfs_save_resvblks(struct xfs_mount *mp)
> {
> uint64_t resblks = 0;
> @@ -1378,37 +1420,9 @@ xfs_fs_remount(
>
> /* rw -> ro */
> if (!(mp->m_flags & XFS_MOUNT_RDONLY) && (*flags & SB_RDONLY)) {
> - /*
> - * Cancel background eofb scanning so it cannot race with the
> - * final log force+buftarg wait and deadlock the remount.
> - */
> - xfs_stop_block_reaping(mp);
> -
> - /* Get rid of any leftover CoW reservations... */
> - error = xfs_icache_free_cowblocks(mp, NULL);
> - if (error) {
> - xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
> - return error;
> - }
> -
> - /* Free the per-AG metadata reservation pool. */
> - error = xfs_fs_unreserve_ag_blocks(mp);
> - if (error) {
> - xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
> + error = xfs_remount_ro(mp);
> + if (error)
> return error;
> - }
> -
> - /*
> - * Before we sync the metadata, we need to free up the reserve
> - * block pool so that the used block count in the superblock on
> - * disk is correct at the end of the remount. Stash the current
> - * reserve pool size so that if we get remounted rw, we can
> - * return it to the same size.
> - */
> - xfs_save_resvblks(mp);
> -
> - xfs_quiesce_attr(mp);
> - mp->m_flags |= XFS_MOUNT_RDONLY;
> }
>
> return 0;
>
