[04/36] xfs: kill xfs_alloc_pagf_init()

Message ID	20211203000111.2800982-5-david@fromorbit.com (mailing list archive)
State	Superseded, archived
Headers	show Return-Path: <linux-xfs-owner@kernel.org> From: Dave Chinner <david@fromorbit.com> To: linux-xfs@vger.kernel.org Subject: [PATCH 04/36] xfs: kill xfs_alloc_pagf_init() Date: Fri, 3 Dec 2021 11:00:39 +1100 Message-Id: <20211203000111.2800982-5-david@fromorbit.com> In-Reply-To: <20211203000111.2800982-1-david@fromorbit.com> References: <20211203000111.2800982-1-david@fromorbit.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	xfs: more work towards shrinking. \| expand [RFC,00/36] xfs: more work towards shrinking. [01/36] xfs: make last AG grow/shrink perag centric [02/36] xfs: kill xfs_ialloc_pagi_init() [03/36] xfs: pass perag to xfs_ialloc_read_agi() [04/36] xfs: kill xfs_alloc_pagf_init() [05/36] xfs: pass perag to xfs_alloc_read_agf() [06/36] xfs: pass perag to xfs_read_agi [07/36] xfs: pass perag to xfs_read_agf [08/36] xfs: pass perag to xfs_alloc_get_freelist [09/36] xfs: pass perag to xfs_alloc_put_freelist [10/36] xfs: pass perag to xfs_alloc_read_agfl [11/36] xfs: Pre-calculate per-AG agbno geometry [12/36] xfs: Pre-calculate per-AG agino geometry [13/36] xfs: replace xfs_ag_block_count() with perag accesses [14/36] xfs: make is_log_ag() a first class helper [15/36] xfs: active perag reference counting [16/36] xfs: rework the perag trace points to be perag centric [17/36] xfs: convert xfs_imap() to take a perag [18/36] xfs: use active perag references for inode allocation [19/36] xfs: inobt can use perags in many more places than it does [20/36] xfs: convert xfs_ialloc_next_ag() to an atomic [21/36] xfs: perags need atomic operational state [22/36] xfs: introduce xfs_for_each_perag_wrap() [23/36] xfs: rework xfs_alloc_vextent() [24/36] xfs: use xfs_alloc_vextent_this_ag() in _iterate_ags() [25/36] xfs: combine __xfs_alloc_vextent_this_ag and xfs_alloc_ag_vextent [26/36] xfs: use xfs_alloc_vextent_this_ag() where appropriate [27/36] xfs: factor xfs_bmap_btalloc() [28/36] xfs: use xfs_alloc_vextent_first_ag() where appropriate [29/36] xfs: use xfs_alloc_vextent_start_bno() where appropriate [30/36] xfs: introduce xfs_alloc_vextent_near_bno() [31/36] xfs: introduce xfs_alloc_vextent_exact_bno() [32/36] xfs: introduce xfs_alloc_vextent_prepare() [33/36] xfs: move allocation accounting to xfs_alloc_vextent_set_fsbno() [34/36] xfs: fold xfs_alloc_ag_vextent() into callers [35/36] xfs: convert xfs_alloc_vextent_iterate_ags() to use perag walker [36/36] xfs: convert trim to use for_each_perag_range

diff --git a/fs/xfs/libxfs/xfs_ag.c b/fs/xfs/libxfs/xfs_ag.c index 2683ffcd0d29..a782b9e584e4 100644 --- a/fs/xfs/libxfs/xfs_ag.c +++ b/fs/xfs/libxfs/xfs_ag.c @@ -124,7 +124,7 @@ xfs_initialize_perag_data( * all the information we need and populates the * per-ag structures for us. */ - error = xfs_alloc_pagf_init(mp, NULL, index, 0); + error = xfs_alloc_read_agf(mp, NULL, index, 0, NULL); if (error) return error; diff --git a/fs/xfs/libxfs/xfs_ag_resv.c b/fs/xfs/libxfs/xfs_ag_resv.c index fe94058d4e9e..ce28bf8f72dc 100644 --- a/fs/xfs/libxfs/xfs_ag_resv.c +++ b/fs/xfs/libxfs/xfs_ag_resv.c @@ -322,7 +322,7 @@ xfs_ag_resv_init( * address. */ if (has_resv) { - error2 = xfs_alloc_pagf_init(mp, tp, pag->pag_agno, 0); + error2 = xfs_alloc_read_agf(mp, tp, pag->pag_agno, 0, NULL); if (error2) return error2; diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c index 353e53b892e6..faa8f7a1ecf8 100644 --- a/fs/xfs/libxfs/xfs_alloc.c +++ b/fs/xfs/libxfs/xfs_alloc.c @@ -2849,25 +2849,6 @@ xfs_alloc_log_agf( xfs_trans_log_buf(tp, bp, (uint)first, (uint)last); } -/* - * Interface for inode allocation to force the pag data to be initialized. - */ -int /* error */ -xfs_alloc_pagf_init( - xfs_mount_t *mp, /* file system mount structure */ - xfs_trans_t *tp, /* transaction pointer */ - xfs_agnumber_t agno, /* allocation group number */ - int flags) /* XFS_ALLOC_FLAGS_... */ -{ - struct xfs_buf *bp; - int error; - - error = xfs_alloc_read_agf(mp, tp, agno, flags, &bp); - if (!error) - xfs_trans_brelse(tp, bp); - return error; -} - /* * Put the block on the freelist for the allocation group. */ @@ -3077,7 +3058,9 @@ xfs_read_agf( } /* - * Read in the allocation group header (free/alloc section). + * Read in the allocation group header (free/alloc section) and initialise the + * perag structure if necessary. If the caller provides @agfbpp, then return the + * locked buffer to the caller, otherwise free it. */ int /* error */ xfs_alloc_read_agf( @@ -3085,8 +3068,9 @@ xfs_alloc_read_agf( struct xfs_trans *tp, /* transaction pointer */ xfs_agnumber_t agno, /* allocation group number */ int flags, /* XFS_ALLOC_FLAG_... */ - struct xfs_buf **bpp) /* buffer for the ag freelist header */ + struct xfs_buf **agfbpp) { + struct xfs_buf *agfbp; struct xfs_agf *agf; /* ag freelist header */ struct xfs_perag *pag; /* per allocation group data */ int error; @@ -3100,13 +3084,12 @@ xfs_alloc_read_agf( ASSERT(agno != NULLAGNUMBER); error = xfs_read_agf(mp, tp, agno, (flags & XFS_ALLOC_FLAG_TRYLOCK) ? XBF_TRYLOCK : 0, - bpp); + &agfbp); if (error) return error; - ASSERT(!(*bpp)->b_error); - agf = (*bpp)->b_addr; - pag = (*bpp)->b_pag; + agf = agfbp->b_addr; + pag = agfbp->b_pag; if (!pag->pagf_init) { pag->pagf_freeblks = be32_to_cpu(agf->agf_freeblks); pag->pagf_btreeblks = be32_to_cpu(agf->agf_btreeblks); @@ -3147,6 +3130,10 @@ xfs_alloc_read_agf( be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNTi])); } #endif + if (agfbpp) + *agfbpp = agfbp; + else + xfs_trans_brelse(tp, agfbp); return 0; } diff --git a/fs/xfs/libxfs/xfs_alloc.h b/fs/xfs/libxfs/xfs_alloc.h index 1c14a0b1abea..76dd3b8b6971 100644 --- a/fs/xfs/libxfs/xfs_alloc.h +++ b/fs/xfs/libxfs/xfs_alloc.h @@ -124,16 +124,6 @@ xfs_alloc_log_agf( struct xfs_buf *bp, /* buffer for a.g. freelist header */ int fields);/* mask of fields to be logged (XFS_AGF_...) */ -/* - * Interface for inode allocation to force the pag data to be initialized. - */ -int /* error */ -xfs_alloc_pagf_init( - struct xfs_mount *mp, /* file system mount structure */ - struct xfs_trans *tp, /* transaction pointer */ - xfs_agnumber_t agno, /* allocation group number */ - int flags); /* XFS_ALLOC_FLAGS_... */ - /* * Put the block on the freelist for the allocation group. */ diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 4dccd4d90622..8924b3749e6a 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -3187,7 +3187,8 @@ xfs_bmap_longest_free_extent( pag = xfs_perag_get(mp, ag); if (!pag->pagf_init) { - error = xfs_alloc_pagf_init(mp, tp, ag, XFS_ALLOC_FLAG_TRYLOCK); + error = xfs_alloc_read_agf(mp, tp, ag, XFS_ALLOC_FLAG_TRYLOCK, + NULL); if (error) { /* Couldn't lock the AGF, so skip this AG. */ if (error == -EAGAIN) { diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index d53d9808fab8..22edd49cfe81 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -1621,7 +1621,7 @@ xfs_dialloc_good_ag( return false; if (!pag->pagf_init) { - error = xfs_alloc_pagf_init(mp, tp, pag->pag_agno, flags); + error = xfs_alloc_read_agf(mp, tp, pag->pag_agno, flags, NULL); if (error) return false; } diff --git a/fs/xfs/xfs_filestream.c b/fs/xfs/xfs_filestream.c index 6a3ce0f6dc9e..e82185aa13f8 100644 --- a/fs/xfs/xfs_filestream.c +++ b/fs/xfs/xfs_filestream.c @@ -126,7 +126,7 @@ xfs_filestream_pick_ag( pag = xfs_perag_get(mp, ag); if (!pag->pagf_init) { - err = xfs_alloc_pagf_init(mp, NULL, ag, trylock); + err = xfs_alloc_read_agf(mp, NULL, ag, trylock, NULL); if (err) { xfs_perag_put(pag); if (err != -EAGAIN) @@ -180,7 +180,7 @@ xfs_filestream_pick_ag( if (ag != startag) continue; - /* Allow sleeping in xfs_alloc_pagf_init() on the 2nd pass. */ + /* Allow sleeping in xfs_alloc_read_agf() on the 2nd pass. */ if (trylock != 0) { trylock = 0; continue;

[04/36] xfs: kill xfs_alloc_pagf_init()

Commit Message

Patch