From patchwork Thu Oct 3 10:26:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Kent X-Patchwork-Id: 11172471 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ED80C14DB for ; Thu, 3 Oct 2019 10:26:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D58F721A4C for ; Thu, 3 Oct 2019 10:26:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728475AbfJCK0k (ORCPT ); Thu, 3 Oct 2019 06:26:40 -0400 Received: from icp-osb-irony-out7.external.iinet.net.au ([203.59.1.107]:43057 "EHLO icp-osb-irony-out7.external.iinet.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727657AbfJCK0k (ORCPT ); Thu, 3 Oct 2019 06:26:40 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2AVAADHy5Vd/7q70HYNWRwBAQEEAQEMBAEBgVMHAQELAYFugkuEIogihwgDBoERihqPMYF7CQEBAQEBAQEBATcBAYQ7AwICgmg0CQ4CDAEBAQQBAQEBAQUDAYVYhhoCAQMjBFIQGA0CJgICRxAGE4UZrgx1fzMaiieBDCgBgWSKQXiBB4ERM4Mdh1GCWASPMDeGOUOWVIItlTMMjhMDixwthAqlHYIRTS4KgydQgX8XjjBnkRsBAQ X-IPAS-Result: A2AVAADHy5Vd/7q70HYNWRwBAQEEAQEMBAEBgVMHAQELAYFugkuEIogihwgDBoERihqPMYF7CQEBAQEBAQEBATcBAYQ7AwICgmg0CQ4CDAEBAQQBAQEBAQUDAYVYhhoCAQMjBFIQGA0CJgICRxAGE4UZrgx1fzMaiieBDCgBgWSKQXiBB4ERM4Mdh1GCWASPMDeGOUOWVIItlTMMjhMDixwthAqlHYIRTS4KgydQgX8XjjBnkRsBAQ X-IronPort-AV: E=Sophos;i="5.67,251,1566835200"; d="scan'208";a="207652958" Received: from unknown (HELO [192.168.1.222]) ([118.208.187.186]) by icp-osb-irony-out7.iinet.net.au with ESMTP; 03 Oct 2019 18:26:38 +0800 Subject: [PATCH v4 15/17] xfs: mount-api - dont set sb in xfs_mount_alloc() From: Ian Kent To: linux-xfs Cc: Brian Foster , Eric Sandeen , David Howells , Dave Chinner , Al Viro Date: Thu, 03 Oct 2019 18:26:38 +0800 Message-ID: <157009839813.13858.13423160432971704368.stgit@fedora-28> In-Reply-To: <157009817203.13858.7783767645177567968.stgit@fedora-28> References: <157009817203.13858.7783767645177567968.stgit@fedora-28> User-Agent: StGit/unknown-version MIME-Version: 1.0 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org 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 Reviewed-by: Brian Foster --- 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);