On Thu, Oct 03, 2019 at 06:26:38PM +0800, Ian Kent wrote:
> When changing to use the new mount api the super block won't be
> available when the xfs_mount info struct is allocated so move
> setting the super block in xfs_mount to xfs_fs_fill_super().
>
> Also change xfs_mount_alloc() decalaration static -> STATIC.
>
> Signed-off-by: Ian Kent <raven@xxxxxxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/xfs_super.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 4f2963ff9e06..919afd7082b7 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -1772,9 +1772,8 @@ xfs_destroy_percpu_counters(
> percpu_counter_destroy(&mp->m_delalloc_blks);
> }
>
> -static struct xfs_mount *
> -xfs_mount_alloc(
> - struct super_block *sb)
> +STATIC struct xfs_mount *
> +xfs_mount_alloc(void)
> {
> struct xfs_mount *mp;
>
> @@ -1782,7 +1781,6 @@ xfs_mount_alloc(
> if (!mp)
> return NULL;
>
> - mp->m_super = sb;
> spin_lock_init(&mp->m_sb_lock);
> spin_lock_init(&mp->m_agirotor_lock);
> INIT_RADIX_TREE(&mp->m_perag_tree, GFP_ATOMIC);
> @@ -1996,9 +1994,10 @@ xfs_fs_fill_super(
> * allocate mp and do all low-level struct initializations before we
> * attach it to the super
> */
> - mp = xfs_mount_alloc(sb);
> + mp = xfs_mount_alloc();
> if (!mp)
> return -ENOMEM;
> + mp->m_super = sb;
> sb->s_fs_info = mp;
>
> error = xfs_parseargs(mp, (char *)data);
>
