xfs: remove xfs_defer_agfl_block

xfs_free_extent_later can handle the extra AGFL special casing with
very little extra logic.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index a46ec864ffdef0e89d3d1d47d73500479d9f4a70..34ab0054a95c18f1614c154cd1456e07beaa77c2 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -2542,46 +2542,14 @@ xfs_agfl_reset(
        clear_bit(XFS_AGSTATE_AGFL_NEEDS_RESET, &pag->pag_opstate);
 }
 
-/*
- * Defer an AGFL block free. This is effectively equivalent to
- * xfs_free_extent_later() with some special handling particular to AGFL blocks.
- *
- * Deferring AGFL frees helps prevent log reservation overruns due to too many
- * allocation operations in a transaction. AGFL frees are prone to this problem
- * because for one they are always freed one at a time. Further, an immediate
- * AGFL block free can cause a btree join and require another block free before
- * the real allocation can proceed. Deferring the free disconnects freeing up
- * the AGFL slot from freeing the block.
- */
-static int
-xfs_defer_agfl_block(
-       struct xfs_trans                *tp,
-       xfs_agnumber_t                  agno,
-       xfs_agblock_t                   agbno,
-       struct xfs_owner_info           *oinfo)
+static enum xfs_defer_ops_type
+xfs_extent_free_item_optype(
+       struct xfs_extent_free_item     *xefi,
+       unsigned int                    free_flags)
 {
-       struct xfs_mount                *mp = tp->t_mountp;
-       struct xfs_extent_free_item     *xefi;
-       xfs_fsblock_t                   fsbno = XFS_AGB_TO_FSB(mp, agno, agbno);
-
-       ASSERT(xfs_extfree_item_cache != NULL);
-       ASSERT(oinfo != NULL);
-
-       if (XFS_IS_CORRUPT(mp, !xfs_verify_fsbno(mp, fsbno)))
-               return -EFSCORRUPTED;
-
-       xefi = kmem_cache_zalloc(xfs_extfree_item_cache,
-                              GFP_KERNEL | __GFP_NOFAIL);
-       xefi->xefi_startblock = fsbno;
-       xefi->xefi_blockcount = 1;
-       xefi->xefi_owner = oinfo->oi_owner;
-       xefi->xefi_agresv = XFS_AG_RESV_AGFL;
-
-       trace_xfs_agfl_free_defer(mp, xefi);
-
-       xfs_extent_free_get_group(mp, xefi);
-       xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_AGFL_FREE, &xefi->xefi_list);
-       return 0;
+       if (xefi->xefi_agresv == XFS_AG_RESV_AGFL)
+               return XFS_DEFER_OPS_TYPE_AGFL_FREE;
+       return XFS_DEFER_OPS_TYPE_FREE;
 }
 
 /*
@@ -2600,6 +2568,7 @@ xfs_defer_extent_free(
 {
        struct xfs_extent_free_item     *xefi;
        struct xfs_mount                *mp = tp->t_mountp;
+       enum xfs_defer_ops_type         optype;
 
        ASSERT(len <= XFS_MAX_BMBT_EXTLEN);
        ASSERT(!isnullstartblock(bno));
@@ -2631,7 +2600,8 @@ xfs_defer_extent_free(
        trace_xfs_extent_free_defer(mp, xefi);
 
        xfs_extent_free_get_group(mp, xefi);
-       *dfpp = xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_FREE, &xefi->xefi_list);
+       optype = xfs_extent_free_item_optype(xefi, free_flags);
+       *dfpp = xfs_defer_add(tp, optype, &xefi->xefi_list);
        return 0;
 }
 
@@ -2889,8 +2859,21 @@ xfs_alloc_fix_freelist(
                if (error)
                        goto out_agbp_relse;
 
-               /* defer agfl frees */
-               error = xfs_defer_agfl_block(tp, args->agno, bno, &targs.oinfo);
+               /*
+                * Defer the AGFL block free.
+                *
+                * This helps to prevent log reservation overruns due to too
+                * many allocation operations in a transaction. AGFL frees are
+                * prone to this problem because for one they are always freed
+                * one at a time.  Further, an immediate AGFL block free can
+                * cause a btree join and require another block free before the
+                * real allocation can proceed.
+                * Deferring the free disconnects freeing up the AGFL slot from
+                * freeing the block.
+                */
+               error = xfs_free_extent_later(tp,
+                               XFS_AGB_TO_FSB(mp, args->agno, bno), 1,
+                               &targs.oinfo, XFS_AG_RESV_AGFL, 0);
                if (error)
                        goto out_agbp_relse;
        }