xfs: merge the perag freeing helpers

Source kernel commit: aa67ec6a25617e36eba4fb28a88159f500a6cac6

There is no good reason to have two different routines for freeing perag
structures for the unmount and error cases.  Add two arguments to specify
the range of AGs to free to xfs_free_perag, and use that to replace
xfs_free_unused_perag_range.

The addition RCU grace period for the error case is harmless, and the
extra check for the AG to actually exist is not required now that the
callers pass the exact known allocated range.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/libxfs/init.c b/libxfs/init.c
index 733ab3f1abc557e7485b76d12fc05277c0f7bd51..483cd99546052fb57ca81889ae2fd169489e457e 100644 (file)
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -789,8 +789,8 @@ libxfs_mount(
                        libxfs_buf_relse(bp);
        }
 
-       error = libxfs_initialize_perag(mp, sbp->sb_agcount, sbp->sb_dblocks,
-                       &mp->m_maxagi);
+       error = libxfs_initialize_perag(mp, 0, sbp->sb_agcount,
+                       sbp->sb_dblocks, &mp->m_maxagi);
        if (error) {
                fprintf(stderr, _("%s: perag init failed\n"),
                        progname);
@@ -930,7 +930,7 @@ libxfs_umount(
         * first place.
         */
        if (xfs_is_perag_data_loaded(mp))
-               libxfs_free_perag(mp);
+               libxfs_free_perag_range(mp, 0, mp->m_sb.sb_agcount);
 
        xfs_da_unmount(mp);
 

diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
index a4173e5f7a595c2dae03582d066d88c3f4b39f54..b9986a00681c1ea924a59b58c28f2350a6c7e163 100644 (file)
--- a/libxfs/libxfs_api_defs.h
+++ b/libxfs/libxfs_api_defs.h
@@ -166,7 +166,7 @@
 #define xfs_finobt_init_cursor         libxfs_finobt_init_cursor
 #define xfs_free_extent                        libxfs_free_extent
 #define xfs_free_extent_later          libxfs_free_extent_later
-#define xfs_free_perag                 libxfs_free_perag
+#define xfs_free_perag_range           libxfs_free_perag_range
 #define xfs_fs_geometry                        libxfs_fs_geometry
 #define xfs_get_initial_prid           libxfs_get_initial_prid
 #define xfs_highbit32                  libxfs_highbit32

diff --git a/libxfs/xfs_ag.c b/libxfs/xfs_ag.c
index 3bbfefe5e469356be2e4fa14d2deccf46a9801cc..a9993215bf9a3009d07e9af4f701c2a2eb334ce3 100644 (file)
--- a/libxfs/xfs_ag.c
+++ b/libxfs/xfs_ag.c
@@ -183,17 +183,20 @@ out:
 }
 
 /*
- * Free up the per-ag resources associated with the mount structure.
+ * Free up the per-ag resources  within the specified AG range.
  */
 void
-xfs_free_perag(
-       struct xfs_mount        *mp)
+xfs_free_perag_range(
+       struct xfs_mount        *mp,
+       xfs_agnumber_t          first_agno,
+       xfs_agnumber_t          end_agno)
+
 {
-       struct xfs_perag        *pag;
        xfs_agnumber_t          agno;
 
-       for (agno = 0; agno < mp->m_sb.sb_agcount; agno++) {
-               pag = xa_erase(&mp->m_perags, agno);
+       for (agno = first_agno; agno < end_agno; agno++) {
+               struct xfs_perag        *pag = xa_erase(&mp->m_perags, agno);
+
                ASSERT(pag);
                XFS_IS_CORRUPT(pag->pag_mount, atomic_read(&pag->pag_ref) != 0);
                xfs_defer_drain_free(&pag->pag_intents_drain);
@@ -268,29 +271,6 @@ xfs_agino_range(
        return __xfs_agino_range(mp, xfs_ag_block_count(mp, agno), first, last);
 }
 
-/*
- * Free perag within the specified AG range, it is only used to free unused
- * perags under the error handling path.
- */
-void
-xfs_free_unused_perag_range(
-       struct xfs_mount        *mp,
-       xfs_agnumber_t          agstart,
-       xfs_agnumber_t          agend)
-{
-       struct xfs_perag        *pag;
-       xfs_agnumber_t          index;
-
-       for (index = agstart; index < agend; index++) {
-               pag = xa_erase(&mp->m_perags, index);
-               if (!pag)
-                       break;
-               xfs_buf_cache_destroy(&pag->pag_bcache);
-               xfs_defer_drain_free(&pag->pag_intents_drain);
-               kfree(pag);
-       }
-}
-
 int
 xfs_initialize_perag(
        struct xfs_mount        *mp,
@@ -364,7 +344,7 @@ out_remove_pag:
 out_free_pag:
        kfree(pag);
 out_unwind_new_pags:
-       xfs_free_unused_perag_range(mp, old_agcount, index);
+       xfs_free_perag_range(mp, old_agcount, index);
        return error;
 }
 

diff --git a/libxfs/xfs_ag.h b/libxfs/xfs_ag.h
index 69fc31e7b8472832c23d63091737399e46158983..6e68d6a3161a0f98638ce381ef487a0bd1f72d9a 100644 (file)
--- a/libxfs/xfs_ag.h
+++ b/libxfs/xfs_ag.h
@@ -144,13 +144,12 @@ __XFS_AG_OPSTATE(prefers_metadata, PREFERS_METADATA)
 __XFS_AG_OPSTATE(allows_inodes, ALLOWS_INODES)
 __XFS_AG_OPSTATE(agfl_needs_reset, AGFL_NEEDS_RESET)
 
-void xfs_free_unused_perag_range(struct xfs_mount *mp, xfs_agnumber_t agstart,
-                       xfs_agnumber_t agend);
 int xfs_initialize_perag(struct xfs_mount *mp, xfs_agnumber_t old_agcount,
                xfs_agnumber_t agcount, xfs_rfsblock_t dcount,
                xfs_agnumber_t *maxagi);
+void xfs_free_perag_range(struct xfs_mount *mp, xfs_agnumber_t first_agno,
+               xfs_agnumber_t end_agno);
 int xfs_initialize_perag_data(struct xfs_mount *mp, xfs_agnumber_t agno);
-void xfs_free_perag(struct xfs_mount *mp);
 
 /* Passive AG references */
 struct xfs_perag *xfs_perag_get(struct xfs_mount *mp, xfs_agnumber_t agno);