On Fri, Aug 23, 2019 at 09:00:27AM +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>
> ---
> fs/xfs/xfs_super.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 9976163dc537..d2a1a62a3edc 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -1766,9 +1766,9 @@ xfs_destroy_percpu_counters(
> percpu_counter_destroy(&mp->m_delalloc_blks);
> }
>
> -static struct xfs_mount *
> +STATIC struct xfs_mount *
> xfs_mount_alloc(
> - struct super_block *sb)
> + void)
No need to have the void on a separate line. With that fixed up:
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> {
> struct xfs_mount *mp;
>
> @@ -1776,7 +1776,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);
> @@ -1990,9 +1989,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)
> goto out;
> + mp->m_super = sb;
> sb->s_fs_info = mp;
>
> error = xfs_parseargs(mp, (char *)data);
>
